Merge change I31c52bef into eclair

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