am 9b0d5ffb: am f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"

* commit '9b0d5ffbb6cc847843e7f5ae7f891000c90a5989':
  Update GLES codegen to be in sync with frameworks/base