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

* commit '93c57ca1b243c2cb4a6e516b1f99e7aed407e53a':
  Update keystore_cli_v2 for keymaster_defs changes.
tree: 280f2fdbf20870de0785929695bde4e76545190f
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE