Merge "Switch to libkeyutils." am: 70c39c84be
am: 2cb7eeed03

Change-Id: I631fe660ef8a38558d5653ee2d64e274837286ea