Merge "Fix issues raised by the GLES 1.1 conformance test"