Merge "Assume OpenGL ES 2.0 support for qemu.gles > 0"