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

* commit '593786c9b885a48a2674e3ebb5c3bab265de2e51':
  keymaster HAL users don't need delete_keypair