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