Merge "emulator: api 26 fix guest rendering" am: 2463d6b8bc am: 44d517c338
am: be3b4023b4  -s ours

Change-Id: I36b3e4820499b62a15c3c23fe2dcfa61f0bed680