Fix tests for Android.
am: 5ca76f3cd2

Change-Id: Ie98e9e08ff4eb1677f18208ad7859e3e0a278d7c