Merge "Change mini-keyctl command format."
am: 34e1b402a6

Change-Id: I2bcf387368cd93852c9a0d7173cd5e37f49ded78