Fix API 26 for public emulators, take 2
am: 256462a4a0

Change-Id: Ia106c2a90b1e7d232ea099a46976358bdbcf35bf