Merge "mini-keyctl cleanup: keep local funcitons static"
am: e16a253cb0

Change-Id: I1678657424220d02aa45f0f6428bcb925792e304