am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17

* commit '7ef22839c336926a16072ea0e5d83dd125bd0b2f':
  back port gles fix to api 17