Switch to libkeyutils.

Bug: http://b/37991155
Test: builds+boots
Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b

Android.mk

@@ -46,6 +46,7 @@ common_shared_libraries := \
 	libsysutils \
 	libbinder \
 	libcutils \
+	libkeyutils \
 	liblog \
 	libdiskconfig \
 	libhardware_legacy \

Ext4Crypt.cpp

@@ -46,8 +46,8 @@
 #include <cutils/fs.h>
 #include <cutils/properties.h>
 
-#include <ext4_utils/key_control.h>
 #include <ext4_utils/ext4_crypt.h>
+#include <keyutils.h>
 
 #include <android-base/file.h>
 #include <android-base/logging.h>

KeyUtil.cpp

@@ -20,12 +20,11 @@
 #include <sstream>
 #include <string>
 
-#include <ext4_utils/key_control.h>
-
 #include <openssl/sha.h>
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <keyutils.h>
 
 #include "KeyStorage.h"
 #include "Utils.h"