Merge "Catch up with OpenGLES API changes."