Merge "keystore_cli_v2: Update AES parameters"
am: 0348d00

* commit '0348d006cb197daef5d99138b4eaff8949b6ee38':
  keystore_cli_v2: Update AES parameters
tree: 342916faf1f135d260d10593f526a6a386060f26
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE