Merge "Update GLES NDK headers" into nyc-dev