am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17

* commit '8ec8f605e13cf601340c75d450fe2af294c2ecbc':
  back port gles fix to api 17