am 25a57171: am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"

* commit '25a571718ce9b8b0a1c3738845e9af4b9f3d1816':
  Update EGL codegen to be in sync with frameworks/base