Merge "Android build library."
Xavier Ducrohet [Tue, 21 Aug 2012 18:41:11 +0000 (11:41 -0700)]

Trivial merge