Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2
am: 9eedb2e603

* commit '9eedb2e60307856dafc53ed4331708ce70c89df3':
  Update keystore_cli_v2 for keymaster_defs changes.
tree: da484267ab96b7b0bd3dfc05676dad44783f0ef4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE