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

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