Merge "Switch to libkeyutils." am: 612eea6b4f am: 7a7df78819 am: f727d05b83
am: 4e19ff7ab1

Change-Id: Iff35b18579b3f7e932d36ed2164fd49b7791f779