diff --git a/device.mk b/device.mk
index 9e68083..22b8128 100644
--- a/device.mk
+++ b/device.mk
@@ -367,6 +367,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.vibrator-service.rosemary
 
+# VNDK
+PRODUCT_PACKAGES += \
+    libutils-v32
+
 # Wi-Fi
 PRODUCT_PACKAGES += \
     android.hardware.wifi.supplicant@1.0.vendor \
diff --git a/extract-files.sh b/extract-files.sh
index 583989f..d488db2 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -61,6 +61,12 @@ function blob_fixup {
         vendor/lib64/libwifi-hal-mtk.so)
             "$PATCHELF" --set-soname libwifi-hal-mtk.so "${2}"
             ;;
+        vendor/lib*/hw/dfps.mt6785.so)
+            "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
+            ;;
+        vendor/lib*/hw/vendor.mediatek.hardware.pq@2.6-impl.so)
+            "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
+            ;;
         vendor/bin/hw/android.hardware.keymaster@4.0-service.beanpod)
             "${PATCHELF}" --add-needed "libshim_beanpod.so" "${2}"
             ;;
diff --git a/vndk/Android.mk b/vndk/Android.mk
new file mode 100644
index 0000000..39b9284
--- /dev/null
+++ b/vndk/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := prebuilts/vndk
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libutils-v32
+LOCAL_SRC_FILES_arm := v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so
+LOCAL_SRC_FILES_arm64 := v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TARGET_ARCH := arm arm64
+LOCAL_MODULE_TAGS := optional
+LOCAL_CHECK_ELF_FILES := false
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_PREBUILT)