am 280436ac: Merge change 8261 into donut

Merge commit '280436accc45c1883766a98499148439fa044531'

* commit '280436accc45c1883766a98499148439fa044531':
  Remove recently-added android.opengl.Version API