Merge change 26109 into eclair

* changes:
  KeyStore: add java interface.