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

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