Merge change I31c52bef into eclair

* changes:
  Revert change incorrectly submitted as part of change #32153.
tree: 4c94083e5904ed9f975489c29f0a9aa14e6551a2
  1. MODULE_LICENSE_APACHE2
  2. NOTICE
  3. awt/
  4. camera/
  5. cmds/
  6. include/
  7. libs/
  8. opengl/
  9. vpn/