Merge "emulator opengl: Fix gralloc color buffer uploads"