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

Change-Id: Id4a46abab3cee3d1ad090f9520fe3863d812b73f