Merge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev