diff --git a/Android.bp b/Android.bp
index 3760285..12d8b2d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,6 +38,7 @@
     ],
     shared_libs: [
         "android.hardware.keymaster@3.0",
+        "android.hardware.keymaster@4.0",
         "libbase",
         "libbinder",
         "libcrypto",
@@ -50,6 +51,7 @@
         "libhardware_legacy",
         "libhidlbase",
         "libhwbinder",
+        "libkeymaster4support",
         "libkeyutils",
         "liblog",
         "liblogwrap",
@@ -113,7 +115,6 @@
         "VoldNativeService.cpp",
         "VoldUtil.cpp",
         "VolumeManager.cpp",
-        "authorization_set.cpp",
         "cryptfs.cpp",
         "fs/Exfat.cpp",
         "fs/Ext4.cpp",