am 593786c9: Merge "keymaster HAL users don\'t need delete_keypair"

* commit '593786c9b885a48a2674e3ebb5c3bab265de2e51':
  keymaster HAL users don't need delete_keypair
tree: f54c67f716beb8e4eda51d16595f1ad159899e9c
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/