diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
deleted file mode 100644
index ca284dfa..00000000
--- a/manifest-gralloc3.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
- android.hardware.audio
- hwbinder
- 7.0
-
- IDevicesFactory
- default
-
-
-
- android.hardware.audio.effect
- hwbinder
- 7.0
-
- IEffectsFactory
- default
-
-
-
- android.hardware.soundtrigger
- hwbinder
- 2.3
-
- ISoundTriggerHw
- default
-
-
-
- android.hardware.media.omx
- hwbinder
- 1.0
-
- IOmx
- default
-
-
- IOmxStore
- default
-
-
-
- android.hardware.graphics.allocator
- hwbinder
- 2.0
-
- IAllocator
- default
-
-
-
- android.hardware.graphics.mapper
- passthrough
- 2.0
-
- IMapper
- default
-
-
-
- android.hardware.graphics.composer
- hwbinder
- 2.4
-
- IComposer
- default
-
-
-
- android.hardware.memtrack
- hwbinder
- 1.0
-
- IMemtrack
- default
-
-
-
- android.hardware.renderscript
- passthrough
- 1.0
-
- IDevice
- default
-
-
-
- android.hardware.drm
- hwbinder
- 1.0
-
- ICryptoFactory
- default
-
-
- IDrmFactory
- default
-
- @1.3::ICryptoFactory/clearkey
- @1.3::IDrmFactory/clearkey
- @1.3::ICryptoFactory/widevine
- @1.3::IDrmFactory/widevine
-
-
- android.hardware.dumpstate
- hwbinder
- 1.0
-
- IDumpstateDevice
- default
-
-
-
- android.hardware.bluetooth
- hwbinder
- 1.1
-
- IBluetoothHci
- default
-
-
-
- android.hardware.bluetooth.audio
- hwbinder
- 2.1
-
- IBluetoothAudioProvidersFactory
- default
-
-
-
- android.hardware.boot
- hwbinder
- @1.2::IBootControl/default
-
-
- android.hardware.sensors
- hwbinder
- 1.0
-
- ISensors
- default
-
-
-
- android.hardware.neuralnetworks
- hwbinder
- 1.2
-
- IDevice
- armnn
-
- @1.2::IDevice/armnn
-
-
- android.hardware.neuralnetworks
- hwbinder
- @1.3::IDevice/google-edgetpu
-
-
- android.hardware.health
- hwbinder
- 2.1
-
- IHealth
- default
-
-
-
- com.google.input
-
- ITouchContextService
- default
-
-
-
- hardware.google.bluetooth.bt_channel_avoidance
- hwbinder
- 1.0
-
- IBTChannelAvoidance
- default
-
-
-
- hardware.google.bluetooth.sar
- hwbinder
- 1.1
-
- IBluetoothSar
- default
-
-
-
- hardware.google.bluetooth.ccc
- hwbinder
- 1.0
-
- IBluetoothCcc
- default
-
-
-
- vendor.google.google_battery
- hwbinder
- 1.1
-
- IGoogleBattery
- default
-
-
-
- vendor.google.whitechapel.audio.audioext
- hwbinder
- 2.0
-
- IAudioExt
- default
-
-
-
- vendor.google.audiometricext
- hwbinder
- 1.0
-
- IAudioMetricExt
- default
-
-
-
-
diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml
deleted file mode 100644
index 9dc7924a..00000000
--- a/manifest_64-gralloc3.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
- android.hardware.audio
- hwbinder
- 7.0
-
- IDevicesFactory
- default
-
-
-
- android.hardware.audio.effect
- hwbinder
- 7.0
-
- IEffectsFactory
- default
-
-
-
- android.hardware.soundtrigger
- hwbinder
- 2.3
-
- ISoundTriggerHw
- default
-
-
-
- android.hardware.graphics.allocator
- hwbinder
- 2.0
-
- IAllocator
- default
-
-
-
- android.hardware.graphics.mapper
- passthrough
- 2.1
-
- IMapper
- default
-
-
-
- android.hardware.graphics.composer
- hwbinder
- 2.4
-
- IComposer
- default
-
-
-
- android.hardware.memtrack
- hwbinder
- 1.0
-
- IMemtrack
- default
-
-
-
- android.hardware.renderscript
- passthrough
- 1.0
-
- IDevice
- default
-
-
-
- android.hardware.drm
- hwbinder
- 1.0
-
- ICryptoFactory
- default
-
-
- IDrmFactory
- default
-
- @1.3::ICryptoFactory/clearkey
- @1.3::IDrmFactory/clearkey
- @1.3::ICryptoFactory/widevine
- @1.3::IDrmFactory/widevine
-
-
- android.hardware.dumpstate
- hwbinder
- 1.0
-
- IDumpstateDevice
- default
-
-
-
- android.hardware.bluetooth
- hwbinder
- 1.1
-
- IBluetoothHci
- default
-
-
-
- android.hardware.bluetooth.audio
- hwbinder
- 2.1
-
- IBluetoothAudioProvidersFactory
- default
-
-
-
- android.hardware.boot
- hwbinder
- @1.2::IBootControl/default
-
-
- android.hardware.sensors
- hwbinder
- 1.0
-
- ISensors
- default
-
-
-
-
- android.hardware.neuralnetworks
- hwbinder
- @1.3::IDevice/google-edgetpu
-
-
- android.hardware.health
- hwbinder
- 2.1
-
- IHealth
- default
-
-
-
- com.google.input
-
- ITouchContextService
- default
-
-
-
- hardware.google.bluetooth.bt_channel_avoidance
- hwbinder
- 1.0
-
- IBTChannelAvoidance
- default
-
-
-
- hardware.google.bluetooth.sar
- hwbinder
- 1.1
-
- IBluetoothSar
- default
-
-
-
- hardware.google.bluetooth.ccc
- hwbinder
- 1.0
-
- IBluetoothCcc
- default
-
-
-
- vendor.google.google_battery
- hwbinder
- 1.1
-
- IGoogleBattery
- default
-
-
-
- vendor.google.whitechapel.audio.audioext
- hwbinder
- 2.0
-
- IAudioExt
- default
-
-
-
- vendor.google.audiometricext
- hwbinder
- 1.0
-
- IAudioMetricExt
- default
-
-
-
-
diff --git a/modem/user.mk b/modem/user.mk
index 81f37736..fb01f2cc 100644
--- a/modem/user.mk
+++ b/modem/user.mk
@@ -1,2 +1,4 @@
-PRODUCT_PACKAGES += dmd
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+ PRODUCT_PACKAGES += dmd
+endif
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/user
diff --git a/modem/userdebug.mk b/modem/userdebug.mk
index 87697a75..4fcab646 100644
--- a/modem/userdebug.mk
+++ b/modem/userdebug.mk
@@ -1,2 +1,4 @@
-PRODUCT_PACKAGES += vcd
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+ PRODUCT_PACKAGES += vcd
+endif
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/userdebug/
diff --git a/task_profiles.json b/task_profiles.json
index fca5a076..864961fb 100644
--- a/task_profiles.json
+++ b/task_profiles.json
@@ -74,7 +74,7 @@
"Params":
{
"Controller": "cpu",
- "Path": "system"
+ "Path": "dex2oat"
}
},
{
@@ -135,7 +135,7 @@
"Params":
{
"Controller": "cpu",
- "Path": "system"
+ "Path": "background"
}
},
{
@@ -245,7 +245,7 @@
"Params":
{
"Controller": "cpu",
- "Path": "system"
+ "Path": "system-background"
}
},
{