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

Change-Id: Id377e9887ba7df0ccd25f578ae0183cc48d36330