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

Change-Id: I91034b270c23b49674e465138c4114e97a733ae5