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

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