Merge change I4db11d50 into eclair

* changes:
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
tree: aa600df0f0ec4747adbd7a832abfbf0c54689553
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE