Merge "Fix the fake Android Target."
Xavier Ducrohet [Sat, 23 Mar 2013 00:02:17 +0000 (00:02 +0000)]

Trivial merge