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

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