diff --git a/device-husky.mk b/device-husky.mk
index 62608e8..8e123ae 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -472,3 +472,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
diff --git a/device-shiba.mk b/device-shiba.mk
index f3b7e91..8da0637 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=26
+    ro.vendor.build.svn=27
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
@@ -441,3 +441,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 2baa227..b944c9c 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -282,15 +282,6 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "CPUSkipMask",
-      "Path": "/proc/vendor_sched/cpu_skip_mask",
-      "Values": [
-        "0x0",
-        "0x80"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "BGUClampMaxBoost",
       "Path": "/proc/vendor_sched/groups/bg/uclamp_max",
@@ -466,16 +457,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SysGroupCfsSkipMask",
-      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
-      "Values": [
-        "0x0",
-        "0x80"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -861,12 +842,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 5000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAPreferredIdleMaskHigh",
@@ -1020,12 +995,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH_EXTEND",
-      "Node": "CPUSkipMask",
-      "Duration": 2000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -1306,18 +1275,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
-      "Duration": 0,
-      "Value": "0x80"
-    },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 1000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1888,12 +1845,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -2056,12 +2007,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "AutoPreferIdle",
@@ -2212,12 +2157,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "AutoPreferIdle",
@@ -2308,12 +2247,6 @@
       "Duration": 0,
       "Value": "4-8"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PowerHALCameraRunning",
@@ -2458,12 +2391,6 @@
       "Duration": 0,
       "Value": "30"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -3107,12 +3034,6 @@
       "Duration": 0,
       "Value": "0-8"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index a5abc50..f5f1ca1 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -268,15 +268,6 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "CPUSkipMask",
-      "Path": "/proc/vendor_sched/cpu_skip_mask",
-      "Values": [
-        "0x0",
-        "0x80"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "BGUClampMaxBoost",
       "Path": "/proc/vendor_sched/groups/bg/uclamp_max",
@@ -452,16 +443,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SysGroupCfsSkipMask",
-      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
-      "Values": [
-        "0x0",
-        "0x80"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -883,12 +864,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 5000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAPreferredIdleMaskHigh",
@@ -1042,12 +1017,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH_EXTEND",
-      "Node": "CPUSkipMask",
-      "Duration": 2000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -1305,18 +1274,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
-      "Duration": 0,
-      "Value": "0x80"
-    },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 1000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
@@ -1737,12 +1694,6 @@
       "Duration": 0,
       "Value": "0-8"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1893,12 +1844,6 @@
       "Duration": 0,
       "Value": "4-8"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "AutoPreferIdle",
@@ -2031,12 +1976,6 @@
       "Duration": 0,
       "Value": "4-8"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "AutoPreferIdle",
@@ -2121,12 +2060,6 @@
       "Duration": 0,
       "Value": "4-8"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PowerHALCameraRunning",
@@ -2271,12 +2204,6 @@
       "Duration": 0,
       "Value": "30"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -2890,12 +2817,6 @@
       "Duration": 0,
       "Value": "4-8"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index aa70c1d..c9ca7d2 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -282,15 +282,6 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "CPUSkipMask",
-      "Path": "/proc/vendor_sched/cpu_skip_mask",
-      "Values": [
-        "0x0",
-        "0x80"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "BGUClampMaxBoost",
       "Path": "/proc/vendor_sched/groups/bg/uclamp_max",
@@ -466,16 +457,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SysGroupCfsSkipMask",
-      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
-      "Values": [
-        "0x0",
-        "0x80"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true
-    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -861,12 +842,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 5000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAPreferredIdleMaskHigh",
@@ -1020,12 +995,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH_EXTEND",
-      "Node": "CPUSkipMask",
-      "Duration": 2000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -1312,18 +1281,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
-      "Duration": 0,
-      "Value": "0x80"
-    },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 1000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1792,12 +1749,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1960,12 +1911,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "AutoPreferIdle",
@@ -2116,12 +2061,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "AutoPreferIdle",
@@ -2218,18 +2157,12 @@
       "Duration": 0,
       "Value": "cam1"
     },
-    {
+   {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
       "Value": "1280"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferHighCap",
@@ -2362,12 +2295,6 @@
       "Duration": 0,
       "Value": "30"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -3011,12 +2938,6 @@
       "Duration": 0,
       "Value": "0-8"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",