diff --git a/Android.bp b/Android.bp
index 18303d3..53d0ad0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,12 +3,15 @@
 // This file is generated by device/google/bonito/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+	],
 }
 
 android_app_import {
 	name: "MobileFeliCaClient",
 	owner: "google",
 	apk: "proprietary/product/app/MobileFeliCaClient/MobileFeliCaClient.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -20,6 +23,7 @@ android_app_import {
 	name: "MobileFeliCaMenuMainApp",
 	owner: "google",
 	apk: "proprietary/product/app/MobileFeliCaMenuMainApp/MobileFeliCaMenuMainApp.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -31,6 +35,7 @@ android_app_import {
 	name: "MobileFeliCaSettingApp",
 	owner: "google",
 	apk: "proprietary/product/app/MobileFeliCaSettingApp/MobileFeliCaSettingApp.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -42,6 +47,7 @@ android_app_import {
 	name: "MobileFeliCaWebPlugin",
 	owner: "google",
 	apk: "proprietary/product/app/MobileFeliCaWebPlugin/MobileFeliCaWebPlugin.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -53,6 +59,7 @@ android_app_import {
 	name: "MobileFeliCaWebPluginBoot",
 	owner: "google",
 	apk: "proprietary/product/app/MobileFeliCaWebPluginBoot/MobileFeliCaWebPluginBoot.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -64,6 +71,7 @@ android_app_import {
 	name: "PixelCameraServicesBonito",
 	owner: "google",
 	apk: "proprietary/product/app/PixelCameraServicesBonito/PixelCameraServicesBonito.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -75,6 +83,7 @@ android_app_import {
 	name: "VZWAPNLib",
 	owner: "google",
 	apk: "proprietary/product/app/VZWAPNLib/VZWAPNLib.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -108,6 +117,7 @@ android_app_import {
 	name: "AmbientSensePrebuilt",
 	owner: "google",
 	apk: "proprietary/product/priv-app/AmbientSensePrebuilt/AmbientSensePrebuilt.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -120,6 +130,7 @@ android_app_import {
 	name: "AppDirectedSMSService",
 	owner: "google",
 	apk: "proprietary/product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -132,6 +143,7 @@ android_app_import {
 	name: "CarrierServices",
 	owner: "google",
 	apk: "proprietary/product/priv-app/CarrierServices/CarrierServices.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -144,6 +156,7 @@ android_app_import {
 	name: "CarrierSettings",
 	owner: "google",
 	apk: "proprietary/product/priv-app/CarrierSettings/CarrierSettings.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -156,6 +169,7 @@ android_app_import {
 	name: "CarrierWifi",
 	owner: "google",
 	apk: "proprietary/product/priv-app/CarrierWifi/CarrierWifi.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -204,6 +218,7 @@ android_app_import {
 	name: "DeviceIntelligenceNetworkPrebuilt",
 	owner: "google",
 	apk: "proprietary/product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -216,6 +231,7 @@ android_app_import {
 	name: "DevicePersonalizationPrebuiltPixel3",
 	owner: "google",
 	apk: "proprietary/product/priv-app/DevicePersonalizationPrebuiltPixel3/DevicePersonalizationPrebuiltPixel3.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -240,6 +256,7 @@ android_app_import {
 	name: "EuiccGoogle",
 	owner: "google",
 	apk: "proprietary/product/priv-app/EuiccGoogle/EuiccGoogle.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -252,6 +269,7 @@ android_app_import {
 	name: "HardwareInfo",
 	owner: "google",
 	apk: "proprietary/product/priv-app/HardwareInfo/HardwareInfo.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -264,6 +282,7 @@ android_app_import {
 	name: "HotwordEnrollmentOKGoogleRT5514",
 	owner: "google",
 	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleRT5514/HotwordEnrollmentOKGoogleRT5514.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -276,6 +295,7 @@ android_app_import {
 	name: "HotwordEnrollmentXGoogleRT5514",
 	owner: "google",
 	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleRT5514/HotwordEnrollmentXGoogleRT5514.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -348,6 +368,7 @@ android_app_import {
 	name: "WfcActivation",
 	owner: "google",
 	apk: "proprietary/product/priv-app/WfcActivation/WfcActivation.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -356,17 +377,6 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "com.qualcomm.qti.services.secureui",
-	owner: "google",
-	apk: "proprietary/system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "google",
@@ -389,6 +399,17 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "com.qualcomm.qti.services.secureui",
+	owner: "google",
+	apk: "proprietary/system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "ims",
 	owner: "google",
@@ -423,22 +444,11 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "qcrilmsgtunnel",
-	owner: "google",
-	apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "CarrierSetup",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/CarrierSetup/CarrierSetup.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -451,6 +461,7 @@ android_app_import {
 	name: "EuiccSupportPixel",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -463,6 +474,7 @@ android_app_import {
 	name: "EuiccSupportPixelPermissions",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -475,6 +487,7 @@ android_app_import {
 	name: "MyVerizonServices",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -487,6 +500,7 @@ android_app_import {
 	name: "OBDM_Permissions",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/OBDM_Permissions/OBDM_Permissions.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -511,6 +525,7 @@ android_app_import {
 	name: "grilservice",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/grilservice/grilservice.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -523,6 +538,7 @@ android_app_import {
 	name: "obdm_stub",
 	owner: "google",
 	apk: "proprietary/system_ext/priv-app/obdm_stub/obdm_stub.apk",
+	preprocessed: true,
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -531,6 +547,18 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "qcrilmsgtunnel",
+	owner: "google",
+	apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "libhwinfo",
 	owner: "google",
@@ -552,13 +580,6 @@ dex_import {
 	product_specific: true,
 }
 
-dex_import {
-	name: "qcrilhook",
-	owner: "google",
-	jars: ["proprietary/system_ext/framework/qcrilhook.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "RadioConfigLib",
 	owner: "google",
@@ -587,6 +608,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "qcrilhook",
+	owner: "google",
+	jars: ["proprietary/system_ext/framework/qcrilhook.jar"],
+	system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "libMpeg4SwEncoder",
 	owner: "google",
diff --git a/bonito-vendor.mk b/bonito-vendor.mk
index 76b8d42..92c89bb 100644
--- a/bonito-vendor.mk
+++ b/bonito-vendor.mk
@@ -97,13 +97,12 @@ PRODUCT_PACKAGES += \
     TetheringEntitlement \
     USCCDM \
     WfcActivation \
-    com.qualcomm.qti.services.secureui \
     QtiTelephonyService \
     atfwd \
+    com.qualcomm.qti.services.secureui \
     ims \
     uceShimService \
     CNEService \
-    qcrilmsgtunnel \
     CarrierSetup \
     EuiccSupportPixel \
     EuiccSupportPixelPermissions \
@@ -112,14 +111,15 @@ PRODUCT_PACKAGES += \
     RilConfigService \
     grilservice \
     obdm_stub \
+    qcrilmsgtunnel \
     libhwinfo \
     uimremoteclientlibrary \
     uimremoteserverlibrary \
-    qcrilhook \
     RadioConfigLib \
     com.android.hotwordenrollment.common.util \
     com.google.android.camera.extensions \
-    google-ril
+    google-ril \
+    qcrilhook
 PRODUCT_COPY_FILES += \
     vendor/google/bonito/proprietary/product/etc/CarrierSettings/a1_at.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/a1_at.pb \
     vendor/google/bonito/proprietary/product/etc/CarrierSettings/ahamo_jp.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/ahamo_jp.pb \