Merge "Add a tool to add keys to keyring."
am: ae7aaab94d

Change-Id: I3a8a215c960948d67646f48af2ed83251ab5a83d