Merge "Refactor keystore."
tree: b746ed05a0889ec3bc947336829e2ca9c0076eb2
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE