Merge "Update keystore_cli_v2 for keymaster_defs changes."