Merge "Use keymaster 1.0 softkeymaster"
tree: 6aadf6f2a5515a17c1b7e8103f95ade4185c9cfc
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/