Fix GLES2 format mismatch am: 4b80682693 am: 17f31733fd