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

Change-Id: I9c9229d0ac6f66066bbd01aa0f4eec8bf58b73af