Merge change 462 into donut

* changes:
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
tree: b2c7db98749f9f69445d66f1280df1ff5189abf8
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE