diff --git a/Android.bp b/Android.bp
index 8a982e2..d027a54 100644
--- a/Android.bp
+++ b/Android.bp
@@ -119,10 +119,10 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libaudioutils_shim",
-                "android.hardware.bluetooth.audio-V4-ndk",
-                "android.hardware.audio.core.sounddose-V2-ndk",
-                "android.hardware.audio.core-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.bluetooth.audio-V5-ndk",
+                "android.hardware.audio.core.sounddose-V3-ndk",
+                "android.hardware.audio.core-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libalsautilsv2",
                 "libaudioaidlcommon",
                 "libaudioutils",
@@ -168,7 +168,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/android.hardware.bluetooth.audio-impl-mediatek.so",
             ],
             shared_libs: [
-                "android.hardware.bluetooth.audio-V4-ndk",
+                "android.hardware.bluetooth.audio-V5-ndk",
                 "libbase",
                 "libbinder_ndk",
                 "libcutils",
@@ -943,8 +943,8 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/hw/android.hardware.audio.effect.aidl-impl-mediatek.so",
             ],
             shared_libs: [
-                "android.hardware.audio.effect-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.audio.effect-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libaudioaidlcommon",
                 "libaudioutils",
                 "libbase",
@@ -1015,7 +1015,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/hw/android.hardware.soundtrigger3-impl.so",
             ],
             shared_libs: [
-                "android.hardware.soundtrigger3-V2-ndk",
+                "android.hardware.soundtrigger3-V3-ndk",
                 "libbase",
                 "libbinder_ndk",
                 "libutils",
@@ -1065,7 +1065,7 @@ cc_prebuilt_library_shared {
                 "libxml2",
                 "libbinder_ndk",
                 "libprocessgroup",
-                "android.hardware.audio.effect-V2-ndk",
+                "android.hardware.audio.effect-V3-ndk",
                 "libfmq",
                 "libbase",
                 "libbluetooth_audio_session_aidl_mtk",
@@ -1081,7 +1081,7 @@ cc_prebuilt_library_shared {
                 "vendor.mediatek.hardware.bluetooth.audio@2.1",
                 "vendor.mediatek.hardware.bluetooth.audio@2.2",
                 "vendor.mediatek.hardware.bluetooth.audio-V1-ndk",
-                "android.hardware.bluetooth.audio-V4-ndk",
+                "android.hardware.bluetooth.audio-V5-ndk",
                 "android.hardware.audio.common@5.0",
                 "libtinycompress",
                 "libaedv",
@@ -3672,7 +3672,8 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libaudioprimarydevicehalifclient.so",
             ],
             shared_libs: [
-                "android.hardware.audio.core-V2-ndk",
+                "libaudioutils_shim",
+                "android.hardware.audio.core-V3-ndk",
                 "libcutils",
                 "liblog",
                 "libutils",
@@ -3867,7 +3868,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libbluetooth_audio_session_aidl_mtk.so",
             ],
             shared_libs: [
-                "android.hardware.bluetooth.audio-V4-ndk",
+                "android.hardware.bluetooth.audio-V5-ndk",
                 "android.hardware.bluetooth.audio@2.0",
                 "android.hardware.bluetooth.audio@2.1",
                 "libbase",
@@ -10861,6 +10862,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libnotifyaudiohal.so",
             ],
             shared_libs: [
+                "libaudioutils_shim",
                 "libbase",
                 "libbinder",
                 "liblog",
@@ -10869,7 +10871,7 @@ cc_prebuilt_library_shared {
                 "libxml2",
                 "libbinder_ndk",
                 "libfmq",
-                "android.hardware.audio.core-V2-ndk",
+                "android.hardware.audio.core-V3-ndk",
                 "libc++",
                 "libc",
                 "libm",
@@ -27714,8 +27716,8 @@ cc_prebuilt_library_shared {
             shared_libs: [
                 "libstagefright_foundation",
                 "libdlbpreg",
-                "android.hardware.audio.effect-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.audio.effect-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libaudioaidlcommon",
                 "libaudioutils",
                 "libbase",
@@ -27751,8 +27753,8 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/soundfx/libswdapaidl.so",
             ],
             shared_libs: [
-                "android.hardware.audio.effect-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.audio.effect-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libaudioaidlcommon",
                 "libaudioutils",
                 "libbase",
@@ -27797,8 +27799,8 @@ cc_prebuilt_library_shared {
                 "libstagefright_foundation",
                 "libdlbpreg",
                 "libdmshal",
-                "android.hardware.audio.effect-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.audio.effect-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libaudioaidlcommon",
                 "libaudioutils",
                 "libbase",
@@ -27835,8 +27837,8 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/soundfx/libswspatializeraidl.so",
             ],
             shared_libs: [
-                "android.hardware.audio.effect-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.audio.effect-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libaudioaidlcommon",
                 "libaudioutils",
                 "libbase",
@@ -28070,7 +28072,7 @@ cc_prebuilt_library_shared {
                 "libbinder_ndk",
                 "android.hardware.common-V2-ndk",
                 "android.hardware.common.fmq-V1-ndk",
-                "android.hardware.audio.common-V3-ndk",
+                "android.hardware.audio.common-V4-ndk",
                 "libc++",
                 "libc",
                 "libm",
@@ -38592,11 +38594,11 @@ cc_prebuilt_binary {
                 "proprietary/vendor/bin/hw/android.hardware.audio.service-aidl.mediatek",
             ],
             shared_libs: [
-                "android.hardware.soundtrigger3-V2-ndk",
-                "android.hardware.audio.core-V2-ndk",
-                "android.hardware.bluetooth.audio-V4-ndk",
-                "android.hardware.audio.core.sounddose-V2-ndk",
-                "android.media.audio.common.types-V3-ndk",
+                "android.hardware.soundtrigger3-V3-ndk",
+                "android.hardware.audio.core-V3-ndk",
+                "android.hardware.bluetooth.audio-V5-ndk",
+                "android.hardware.audio.core.sounddose-V3-ndk",
+                "android.media.audio.common.types-V4-ndk",
                 "libalsautilsv2",
                 "libaudioaidlcommon",
                 "libaudioutils",
diff --git a/proprietary/vendor/bin/hw/android.hardware.audio.service-aidl.mediatek b/proprietary/vendor/bin/hw/android.hardware.audio.service-aidl.mediatek
index 4a0b9eb..bc3c88b 100755
Binary files a/proprietary/vendor/bin/hw/android.hardware.audio.service-aidl.mediatek and b/proprietary/vendor/bin/hw/android.hardware.audio.service-aidl.mediatek differ
diff --git a/proprietary/vendor/lib64/android.hardware.audio.core-impl-mediatek.so b/proprietary/vendor/lib64/android.hardware.audio.core-impl-mediatek.so
index 313c6c6..3a55ffe 100644
Binary files a/proprietary/vendor/lib64/android.hardware.audio.core-impl-mediatek.so and b/proprietary/vendor/lib64/android.hardware.audio.core-impl-mediatek.so differ
diff --git a/proprietary/vendor/lib64/android.hardware.bluetooth.audio-impl-mediatek.so b/proprietary/vendor/lib64/android.hardware.bluetooth.audio-impl-mediatek.so
index e870b35..50d305f 100644
Binary files a/proprietary/vendor/lib64/android.hardware.bluetooth.audio-impl-mediatek.so and b/proprietary/vendor/lib64/android.hardware.bluetooth.audio-impl-mediatek.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.audio.effect.aidl-impl-mediatek.so b/proprietary/vendor/lib64/hw/android.hardware.audio.effect.aidl-impl-mediatek.so
index 3d9a950..8ddba8c 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.audio.effect.aidl-impl-mediatek.so and b/proprietary/vendor/lib64/hw/android.hardware.audio.effect.aidl-impl-mediatek.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.soundtrigger3-impl.so b/proprietary/vendor/lib64/hw/android.hardware.soundtrigger3-impl.so
index c03ac90..3a4034d 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.soundtrigger3-impl.so and b/proprietary/vendor/lib64/hw/android.hardware.soundtrigger3-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/audio.primary.mediatek.so b/proprietary/vendor/lib64/hw/audio.primary.mediatek.so
index e691eed..770a998 100644
Binary files a/proprietary/vendor/lib64/hw/audio.primary.mediatek.so and b/proprietary/vendor/lib64/hw/audio.primary.mediatek.so differ
diff --git a/proprietary/vendor/lib64/libaudio_aidl_conversion_common_ndk_prebuilt.so b/proprietary/vendor/lib64/libaudio_aidl_conversion_common_ndk_prebuilt.so
index 1213803..e2305db 100644
Binary files a/proprietary/vendor/lib64/libaudio_aidl_conversion_common_ndk_prebuilt.so and b/proprietary/vendor/lib64/libaudio_aidl_conversion_common_ndk_prebuilt.so differ
diff --git a/proprietary/vendor/lib64/libaudioprimarydevicehalifclient.so b/proprietary/vendor/lib64/libaudioprimarydevicehalifclient.so
index 667c174..65caeeb 100644
Binary files a/proprietary/vendor/lib64/libaudioprimarydevicehalifclient.so and b/proprietary/vendor/lib64/libaudioprimarydevicehalifclient.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_aidl_mtk.so b/proprietary/vendor/lib64/libbluetooth_audio_session_aidl_mtk.so
index 4c843d4..51c7248 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_aidl_mtk.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_aidl_mtk.so differ
diff --git a/proprietary/vendor/lib64/libnotifyaudiohal.so b/proprietary/vendor/lib64/libnotifyaudiohal.so
index 95f9f14..5120d2e 100644
Binary files a/proprietary/vendor/lib64/libnotifyaudiohal.so and b/proprietary/vendor/lib64/libnotifyaudiohal.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so b/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so
index 4fc5104..3fc4a02 100644
Binary files a/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so and b/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libswdapaidl.so b/proprietary/vendor/lib64/soundfx/libswdapaidl.so
index ee026de..d1cbb4a 100644
Binary files a/proprietary/vendor/lib64/soundfx/libswdapaidl.so and b/proprietary/vendor/lib64/soundfx/libswdapaidl.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so b/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so
index 9bd9790..b76d82a 100644
Binary files a/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so and b/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so b/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so
index c476223..2c06f6a 100644
Binary files a/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so and b/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so differ
diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio-V1-ndk.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio-V1-ndk.so
index f5bf2c9..ea8cef0 100644
Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio-V1-ndk.so and b/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio-V1-ndk.so differ