Merge "emulator: opengl: re-enable gralloc builds"