diff --git a/Android.bp b/Android.bp
index 9515b25..0042fe4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,2 +1,53 @@
 soong_namespace {
 }
+
+cc_prebuilt_library_shared {
+        name: "libqmiservices",
+        owner: "samsung",
+        strip: {
+                none: true,
+        },
+        target: {
+                android_arm: {
+                        srcs: ["proprietary/vendor/lib/libqmiservices.so"],
+                },
+        },
+        compile_multilib: "32",
+        check_elf_files: false,
+        prefer: true,
+        soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+        name: "libmdmdetect",
+        owner: "samsung",
+        strip: {
+                none: true,
+        },
+        target: {
+                android_arm: {
+                        srcs: ["proprietary/vendor/lib/libmdmdetect.so"],
+                },
+        },
+        compile_multilib: "32",
+        check_elf_files: false,
+        prefer: true,
+        soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+        name: "libqmi_cci",
+        owner: "samsung",
+        strip: {
+                none: true,
+        },
+        target: {
+                android_arm: {
+                        srcs: ["proprietary/vendor/lib/libqmi_cci.so"],
+                },
+        },
+        compile_multilib: "32",
+        check_elf_files: false,
+        prefer: true,
+        soc_specific: true,
+}
diff --git a/mondrianwifi-vendor.mk b/mondrianwifi-vendor.mk
index 309960d..bf44f19 100755
--- a/mondrianwifi-vendor.mk
+++ b/mondrianwifi-vendor.mk
@@ -15,6 +15,9 @@
 
 # This file is generated by device/samsung/mondrianwifi/setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/samsung/mondrianwifi
+
 PRODUCT_COPY_FILES += \
     vendor/samsung/mondrianwifi/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
     vendor/samsung/mondrianwifi/proprietary/vendor/bin/btnvtool:$(TARGET_COPY_OUT_VENDOR)/bin/btnvtool \
@@ -149,7 +152,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libinvensense_hal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libinvensense_hal.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libldacBT_enc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libldacBT_enc.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libliveframework.so:$(TARGET_COPY_OUT_VENDOR)/lib/libliveframework.so \
-    vendor/samsung/mondrianwifi/proprietary/vendor/lib/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdmdetect.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libmllite.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmllite.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libmm-abl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-abl.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libmm-abl-oem.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-abl-oem.so \
@@ -200,13 +202,11 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdp.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi.so \
-    vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_cci.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi_client_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_helper.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_qmux.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_common_so.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csi.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
-    vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqomx_core.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqomx_core.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libqomx_jpegenc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqomx_jpegenc.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib/libQSEEComAPI.so \
@@ -232,3 +232,8 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/soundfx/libqcbassboost.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcbassboost.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcreverb.so \
     vendor/samsung/mondrianwifi/proprietary/vendor/lib/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcvirt.so
+
+PRODUCT_PACKAGES += \
+    libmdmdetect \
+    libqmiservices \
+    libqmi_cci