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

Change-Id: I03d020396a527a8a27c7ec3d6d86fb2223787dcf