diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index abc18c58..09898cbd 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -897,7 +897,7 @@ on property:vendor.brownout.mitigation.ready=1
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0x80041c3 #DFS
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c0 #DFS
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0 #DFS
-    write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c1 #DFS
+    write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c3 #DFS
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c3 #OCP
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385 #OCP
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1 #OCP
diff --git a/device.mk b/device.mk
index 04585d5b..8febfa10 100644
--- a/device.mk
+++ b/device.mk
@@ -37,7 +37,6 @@ include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
 include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
-include device/google/gs-common/betterbug/betterbug.mk
 ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
@@ -514,10 +513,6 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
 PRODUCT_PACKAGES += \
 	com.android.future.usb.accessory
 
-PRODUCT_PACKAGES += \
-	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator-V1-service
-
 PRODUCT_PACKAGES += \
 	android.hardware.memtrack-service.pixel \
 	libion_exynos \
@@ -1159,3 +1154,4 @@ PRODUCT_PACKAGES += ufs_firmware_update.sh
 
 # Touch service
 include device/google/gs-common/touch/twoshay/aidl_gs101.mk
+include device/google/gs-common/touch/twoshay/twoshay.mk
diff --git a/manifest_media.xml b/manifest_media.xml
index 38e56ba2..b29c7f2f 100644
--- a/manifest_media.xml
+++ b/manifest_media.xml
@@ -1,4 +1,5 @@
 <manifest version="1.0" type="device">
+    <!-- HIDL fragment -->
     <hal format="hidl">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
@@ -17,4 +18,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <!-- AIDL fragment -->
+    <hal format="aidl">
+      <name>android.hardware.media.c2</name>
+      <version>1</version>
+      <fqname>IComponentStore/default1</fqname>
+    </hal>
+    <hal format="aidl">
+      <name>android.hardware.media.c2</name>
+      <version>1</version>
+      <fqname>IComponentStore/default</fqname>
+    </hal>
 </manifest>
diff --git a/manifest_media_aosp.xml b/manifest_media_aosp.xml
index 9a1a3dba..2d1888be 100644
--- a/manifest_media_aosp.xml
+++ b/manifest_media_aosp.xml
@@ -1,4 +1,5 @@
 <manifest version="1.0" type="device">
+    <!-- HIDL fragment -->
     <hal format="hidl">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
@@ -8,4 +9,10 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <!-- AIDL fragment -->
+    <hal format="aidl">
+      <name>android.hardware.media.c2</name>
+      <version>1</version>
+      <fqname>IComponentStore/default</fqname>
+    </hal>
 </manifest>