Merge "Refactor mini-keyctl and split a static library"