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

Change-Id: Ic28a7f9967ee1bc2afcdf22da20c0e68aa0c3eb2