Merge "emulator: api 26 fix guest rendering"