Merge "Add encryption convenience methods to KeystoreClient."
tree: 2a6e7b1e61c7ebd24dc805697d70b4ed2062908e
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/