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

Change-Id: Ieb39066166697dad152805c5af7f64bc4a02e5c2