Merge change 24509 into eclair

* changes:
  Addressed reviewer comments.
tree: 287bc3a7679da7634c717534aa42608b0404a9af
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE