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

Change-Id: Ia349687c69c695eb089b46395a167179a9716e33