am 12248fd3: Merge "Implement delete_key and delete_all_keys in SoftKeymasterDevice." into mnc-dev

* commit '12248fd3e82e61ca4be194caf6347152dacf219d':
  Implement delete_key and delete_all_keys in SoftKeymasterDevice.