am 6e3ed47a: (-s ours) am aa028a3c: back port gles fix to api 18

* commit '6e3ed47ab0b06e09d4b8531e05805c4b3ea0e924':
  back port gles fix to api 18