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>
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index f464ced..50a14b6 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -466,6 +466,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x80"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 1f2ae91..c1fd03c 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -452,6 +452,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x80"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 26f7ea9..c27e274 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -466,6 +466,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x80"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",