Merge change 8261 into donut

* changes:
  Remove recently-added android.opengl.Version API