am f8ac5e31: back port gles fix to api 17

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