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

* commit '4e18d73d1ba1226126fca1ffd53febf24104c55c':
  emulator opengl: Fix gralloc color buffer uploads