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

* commit '472716143c3349f554ff39dfaeaa5b2f2d17b7f7':
  emulator opengl: Fix gralloc color buffer uploads