Merge "install mini-keyctl to /system/bin" am: 055b549497
am: 8307c34ed7

Change-Id: I6b677554b1f4ab184531e16049b080fe1b97aa57