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

Change-Id: I1d0b52cd2d317b7d88ec8cc895f0bc553f1a9587