drop "Android" from the Test error message am: e6f9679d01
am: b13c1acffd

Change-Id: I6254bc3fa081d9b1854eceeb259c68ad9447fcf5