AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
1 file changed
tree: 381d9f9cc7f7ab5845d1c522cf7954dc27930259
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE