am 7da2a217: am 27c128d7: Merge "GLESv1 extensions"

* commit '7da2a217ee184dfc688a0199ad7caa3fff3dd94e':
  GLESv1 extensions