Merge change 24673 into eclair

* changes:
  Add tests and misc fixes on keystore.
tree: d5a9b9ad830801707d26a84661ef5ab48441278e
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE