Merge change 25737 into eclair

* changes:
  keystore: switch to multi-user version.
tree: 7314470155cd4dfbed5c2432f571e25b1c6bb8d3
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE