am d8166872: (-s ours) back port gles fix to api 16

* commit 'd81668725d81d6b3020b08e6fbc72acf3dc1c0c8':
  back port gles fix to api 16