Merge "Manually fix GLES headers" into nyc-dev
am: a282c18

* commit 'a282c184366bf8b9520ee19fcc1aa7667db7db78':
  Manually fix GLES headers