Fix tests for Android. am: 5ca76f3cd2
am: c690000257

Change-Id: Ief6606fa605988d7e3871d3fb5b8efca16b537bd