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

Change-Id: If8e75f1e8e2010e95612d045a48af9e10b03ea8a