Merge "Change the way the AndroidBuilder is created and used."
Xavier Ducrohet [Thu, 23 Aug 2012 23:21:09 +0000 (16:21 -0700)]

Trivial merge