Merge "Add a tool to add keys to keyring." am: ae7aaab94d am: 0d2d068600
am: 288e5d91b6

Change-Id: I99b506b5c9d5c67b537ac6888a80533d2bfd64c8