Reliably delete keys if key generation fails.

Bug: 18088752
Change-Id: Iea68f3f96fc872d5628f163a1314ebd080c9d39e
2 files changed