diff --git a/audio/tegu/tas2572/fw/ti_sp_tuning.bin b/audio/tegu/tas2572/fw/ti_sp_tuning.bin
index f97befb..02805d2 100644
Binary files a/audio/tegu/tas2572/fw/ti_sp_tuning.bin and b/audio/tegu/tas2572/fw/ti_sp_tuning.bin differ
diff --git a/audio/tegu/tas2572/fw/tismartpa_driver_tuning.bin b/audio/tegu/tas2572/fw/tismartpa_driver_tuning.bin
index 6ed8e53..f8dad83 100644
Binary files a/audio/tegu/tas2572/fw/tismartpa_driver_tuning.bin and b/audio/tegu/tas2572/fw/tismartpa_driver_tuning.bin differ
diff --git a/device-tegu.mk b/device-tegu.mk
index 8be00e8..9195814 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -73,6 +73,7 @@ PRODUCT_COPY_FILES += \
 # USE_OEMSERVICE_HAL_AIDL := true
 # Enable AIDL based radioExternal HAL
 USE_RADIOEXTERNAL_HAL_AIDL := true
+$(call soong_config_set,grilservice,USE_RADIOEXTERNAL_HAL_AIDL,true)
 
 # NFC
 PRODUCT_COPY_FILES += \
diff --git a/manifest.xml b/manifest.xml
index e01d156..18109c6 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>