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

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