Merge "Refactor mini-keyctl and split a static library" am: 4fea237bf3
am: 69564c2ec2

Change-Id: Ia7d7c6e58dd955618bc3eeea0de539e9eff061f8