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

Change-Id: I91a0c46c31d6c4a1c5c5162e03f759e419c221ab