Merge "mini-keyctl: fix key id parsing by "0x" prefix" am: 220241f266
am: 8605ae6646

Change-Id: Id96db09168000a5a02cf93682d6110f0cc4edce2