Merge "Revive test script for keystore" am: 91e439b0e8
am: d91cf18037

* commit 'd91cf18037763a129c0fac2dedcf3f4d15928e17':
  Revive test script for keystore
tree: 835a98ea843542ed053a665f303be5fad04dd2fe
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/