Merge "Update GLES codegen to be in sync with frameworks/base"