Merge "keystore: fix upgrades"
tree: bcccc7411e3d1597b9fa8c71c85c92c8e33af1e3
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/