am a792c749: am 47271614: am cb0cad4b: am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"

* commit 'a792c7495d2c342ce5de9803281bf33a51973a40':
  emulator opengl: Fix gralloc color buffer uploads