Android m preview
Merge "Cleanup keystore API"
tree: 3ca90271ac3be8dd708531e4838aed070a6fbb57
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/