diff --git a/Android.mk b/Android.mk
index 151be41635..79e88c9167 100644
--- a/Android.mk
+++ b/Android.mk
@@ -297,6 +297,11 @@ ifeq ($(TW_INCLUDE_L_CRYPTO), true)
 endif
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO
+    
+    ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
+    LOCAL_SHARED_LIBRARIES += libcryptfs_hw
+    endif
+    
     LOCAL_SHARED_LIBRARIES += libcryptfslollipop libgpt_twrp
     LOCAL_C_INCLUDES += external/boringssl/src/include
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 93ae610bf0..61328ecf4d 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -169,9 +169,6 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libgpt_twrp.so
-    ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
-        RELINK_SOURCE_FILES += $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libcryptfs_hw.so
-    endif
     # FBE files
     ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)
         RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libe4crypt.so