Merge "Delete the dumpkey host tool" am: 14d5540426
am: 74fa7cd1d9

Change-Id: I29c52bae6638531c2ad8c8357b362fa10bd98d90