Merge "Revert "Check GLES2 support using EGL instead of qemu.gles""