am d1286137: am 8e2dc32b: Merge "Add GLESv2 functionality to GLESv1/GLESv2 shared code"

* commit 'd1286137f73a6547f6728f9d76752b59ad60c720':
  Add GLESv2 functionality to GLESv1/GLESv2 shared code