Merge "Manually fix GLES headers" into nyc-dev