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

* commit 'e591d22bb0cadf6c9f33f892e546f72125483718':
  back port gles fix to api 17