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

* commit '9bdb1793b0d7b02f626d853a44f4adbe6847366e':
  back port gles fix to api 17