Merge change 462 into donut

* changes:
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.