diff --git a/dolby.mk b/dolby.mk
index ff3d7a1..60bcae3 100644
--- a/dolby.mk
+++ b/dolby.mk
@@ -52,6 +52,11 @@ PRODUCT_PACKAGES += \
     DaxUI \
     daxService
 
+# VNDK
+PRODUCT_COPY_FILES += \
+    prebuilts/vndk/v33/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefright_foundation-v33.so \
+    prebuilts/vndk/v33/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_foundation.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libstagefright_foundation-v33.so
+
 # Proprietary blobs
 PRODUCT_COPY_FILES += \
     $(DOLBY_PATH)/proprietary/system/lib64/vendor.dolby.hardware.dms@2.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.dolby.hardware.dms@2.0.so \
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100644
index 0000000..7ce3c3f
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../.."
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+function blob_fixup() {
+    case "${1}" in
+       vendor/lib/libstagefright_soft_ac4dec.so | vendor/lib/libstagefright_soft_ddpdec.so | vendor/lib/libstagefrightdolby.so | vendor/lib64/libdlbdsservice.so | vendor/lib64/libstagefright_soft_ac4dec.so | vendor/lib64/libstagefright_soft_ddpdec.so | vendor/lib64/libstagefrightdolby.so)
+            grep -q "libstagefright_foundation-v33.so" "${2}" || "${PATCHELF}" --replace-needed "libstagefright_foundation.so" "libstagefright_foundation-v33.so" "${2}"
+            ;;
+    esac
+}
diff --git a/proprietary/vendor/lib/libstagefright_soft_ac4dec.so b/proprietary/vendor/lib/libstagefright_soft_ac4dec.so
index e2f2e54..0bee286 100644
Binary files a/proprietary/vendor/lib/libstagefright_soft_ac4dec.so and b/proprietary/vendor/lib/libstagefright_soft_ac4dec.so differ
diff --git a/proprietary/vendor/lib/libstagefright_soft_ddpdec.so b/proprietary/vendor/lib/libstagefright_soft_ddpdec.so
index 2875451..6db7694 100644
Binary files a/proprietary/vendor/lib/libstagefright_soft_ddpdec.so and b/proprietary/vendor/lib/libstagefright_soft_ddpdec.so differ
diff --git a/proprietary/vendor/lib/libstagefrightdolby.so b/proprietary/vendor/lib/libstagefrightdolby.so
index 6ed697d..58b227d 100644
Binary files a/proprietary/vendor/lib/libstagefrightdolby.so and b/proprietary/vendor/lib/libstagefrightdolby.so differ
diff --git a/proprietary/vendor/lib64/libdlbdsservice.so b/proprietary/vendor/lib64/libdlbdsservice.so
index fadb371..23be8e1 100644
Binary files a/proprietary/vendor/lib64/libdlbdsservice.so and b/proprietary/vendor/lib64/libdlbdsservice.so differ
diff --git a/proprietary/vendor/lib64/libstagefright_soft_ac4dec.so b/proprietary/vendor/lib64/libstagefright_soft_ac4dec.so
index 2357181..5f2fea5 100644
Binary files a/proprietary/vendor/lib64/libstagefright_soft_ac4dec.so and b/proprietary/vendor/lib64/libstagefright_soft_ac4dec.so differ
diff --git a/proprietary/vendor/lib64/libstagefright_soft_ddpdec.so b/proprietary/vendor/lib64/libstagefright_soft_ddpdec.so
index 14a6155..28fdeac 100644
Binary files a/proprietary/vendor/lib64/libstagefright_soft_ddpdec.so and b/proprietary/vendor/lib64/libstagefright_soft_ddpdec.so differ
diff --git a/proprietary/vendor/lib64/libstagefrightdolby.so b/proprietary/vendor/lib64/libstagefrightdolby.so
index fc573a8..bdad323 100644
Binary files a/proprietary/vendor/lib64/libstagefrightdolby.so and b/proprietary/vendor/lib64/libstagefrightdolby.so differ