am b152c0e7: am 3a4699ee: am 4aaaae0d: am 50f3a088: am 55fd7dc9: am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16

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