Merge "Use AndroidBuilder to build basic APK."
Xavier Ducrohet [Thu, 23 Aug 2012 23:20:53 +0000 (16:20 -0700)]

Trivial merge