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

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