Merge "Update GLES NDK headers" into nyc-dev
am: c6d57d4

* commit 'c6d57d42c3adb033189b8eccc7c73d4082a38c5d':
  Update GLES NDK headers