Merge "Change the way AndroidBuilder is configured."
Xavier Ducrohet [Mon, 27 Aug 2012 23:13:20 +0000 (16:13 -0700)]

Trivial merge