Merge "Switch to libkeyutils."
am: 70c39c84be

Change-Id: Icc52051c57c4b7783d05b53c9f10e4ba4a826f87