diff --git a/Android.mk b/Android.mk
index fcc573c..4ba7d3f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,21 +26,6 @@ LOCAL_PATH := $(call my-dir)
 # their rules should be written here.
 
 ifeq ($(USES_DEVICE_GOOGLE_BLUEJAY),true)
-DM_LIBS := libdmengine.so libdmjavaplugin.so
-DM_32_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT)/priv-app/DMService/lib/arm/,$(notdir $(DM_LIBS)))
-$(DM_32_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "DMService 32 lib link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /product/lib/$(notdir $@) $@
-
-DM_64_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT)/priv-app/DMService/lib/arm64/,$(notdir $(DM_LIBS)))
-$(DM_64_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "DMService 64 lib link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /product/lib64/$(notdir $@) $@
-
 HBM_LIBS := libhbmsvmanager_jni.so
 HBM_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT)/priv-app/HbmSVManager/lib/arm64/,$(notdir $(HBM_LIBS)))
 $(HBM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@@ -49,5 +34,5 @@ $(HBM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@rm -rf $@
 	$(hide) ln -sf /system_ext/lib64/$(notdir $@) $@
 
-ALL_DEFAULT_INSTALLED_MODULES += $(DM_32_SYMLINKS) $(DM_64_SYMLINKS) $(HBM_SYMLINKS)
+ALL_DEFAULT_INSTALLED_MODULES += $(HBM_SYMLINKS)
 endif
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 75efd35..8ae1e4a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -51,10 +51,10 @@ product/etc/sysconfig/pixel_experience_2021_midyear.xml
 product/etc/permissions/com.android.sdm.plugins.connmo.xml
 product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 product/etc/permissions/com.android.sdm.plugins.diagmon.xml
-product/lib/libdmengine.so
-product/lib/libdmjavaplugin.so
-product/lib64/libdmengine.so
-product/lib64/libdmjavaplugin.so
+product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengine.so
+product/lib/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmjavaplugin.so
+product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
+product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
 product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk