Merge "Add GLESv2 functionality to GLESv1/GLESv2 shared code"