Merge "emulator: api 26 fix guest rendering"
am: 2463d6b8bc

Change-Id: I738405a6b9ccc1217850caab0f992a675f09b9aa