am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"

* commit 'e6868d1eebdc2057c19ecac23cdff37d9ca2cdd2':
  Fix issues raised by the GLES 1.1 conformance test