Merge "Update Keystore to use keymaster2 HAL."
am: fd50293cd5

* commit 'fd50293cd5f91936ea954b0556f3f434243adf27':
  Update Keystore to use keymaster2 HAL.
tree: 562f8c313cd6071882a86219a1a037d432ae1677
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE