Merge "keymaster HAL users don't need delete_keypair"