Merge "mini-keyctl: use ParseInt to parse keys"
am: 8aa059438d

Change-Id: I3e2ce4749129943ea8dc9e0eaa74721e57f52c03