Merge "Let crosvm be able to use TAP interface created by vmnic" into main
diff --git a/build/soong/service_fuzzer_bindings.go b/build/soong/service_fuzzer_bindings.go
index bb832eb..6ea7679 100644
--- a/build/soong/service_fuzzer_bindings.go
+++ b/build/soong/service_fuzzer_bindings.go
@@ -151,355 +151,355 @@
 		"android.frameworks.location.altitude.IAltitudeService/default":           EXCEPTION_NO_FUZZER,
 		"android.frameworks.sensorservice.ISensorManager/default":                 []string{"libsensorserviceaidl_fuzzer"},
 		"android.frameworks.stats.IStats/default":                                 EXCEPTION_NO_FUZZER,
-                "android.frameworks.vibrator.IVibratorControlService/default":             EXCEPTION_NO_FUZZER,
+		"android.frameworks.vibrator.IVibratorControlService/default":             EXCEPTION_NO_FUZZER,
 		"android.se.omapi.ISecureElementService/default":                          EXCEPTION_NO_FUZZER,
 		"android.system.keystore2.IKeystoreService/default":                       EXCEPTION_NO_FUZZER,
 		"android.system.net.netd.INetd/default":                                   []string{"netd_hw_service_fuzzer"},
 		"android.system.suspend.ISystemSuspend/default":                           EXCEPTION_NO_FUZZER,
-		"accessibility":      EXCEPTION_NO_FUZZER,
-		"account":            EXCEPTION_NO_FUZZER,
-		"activity":           EXCEPTION_NO_FUZZER,
-		"activity_task":      EXCEPTION_NO_FUZZER,
-		"adaptive_auth":      EXCEPTION_NO_FUZZER,
-		"adb":                EXCEPTION_NO_FUZZER,
-		"adservices_manager": EXCEPTION_NO_FUZZER,
-		"aidl_lazy_test_1":   EXCEPTION_NO_FUZZER,
-		"aidl_lazy_test_2":   EXCEPTION_NO_FUZZER,
-		"aidl_lazy_test_quit":   EXCEPTION_NO_FUZZER,
-		"aidl_lazy_cb_test":  EXCEPTION_NO_FUZZER,
-		"alarm":              EXCEPTION_NO_FUZZER,
-		"android.hardware.automotive.evs.IEvsEnumerator/default":          EXCEPTION_NO_FUZZER,
-		"android.os.UpdateEngineService":                                  []string{"update_engine_service_fuzzer"},
-		"android.os.UpdateEngineStableService":                            []string{"update_engine_service_fuzzer"},
-		"android.frameworks.automotive.display.ICarDisplayProxy/default":  EXCEPTION_NO_FUZZER,
-		"android.security.apc":                                            EXCEPTION_NO_FUZZER,
-		"android.security.authorization":                                  []string{"authorization_service_fuzzer"},
-		"android.security.compat":                                         EXCEPTION_NO_FUZZER,
-		"android.security.dice.IDiceMaintenance":                          EXCEPTION_NO_FUZZER,
-		"android.security.dice.IDiceNode":                                 EXCEPTION_NO_FUZZER,
-		"android.security.identity":                                       []string{"credstore_service_fuzzer"},
-		"android.security.keystore":                                       EXCEPTION_NO_FUZZER,
-		"android.security.legacykeystore":                                 EXCEPTION_NO_FUZZER,
-		"android.security.maintenance":                                    EXCEPTION_NO_FUZZER,
-		"android.security.metrics":                                        EXCEPTION_NO_FUZZER,
-		"android.service.gatekeeper.IGateKeeperService":                   []string{"gatekeeperd_service_fuzzer"},
-		"android.system.composd":                                          EXCEPTION_NO_FUZZER,
+		"accessibility":       EXCEPTION_NO_FUZZER,
+		"account":             EXCEPTION_NO_FUZZER,
+		"activity":            EXCEPTION_NO_FUZZER,
+		"activity_task":       EXCEPTION_NO_FUZZER,
+		"adaptive_auth":       EXCEPTION_NO_FUZZER,
+		"adb":                 EXCEPTION_NO_FUZZER,
+		"adservices_manager":  EXCEPTION_NO_FUZZER,
+		"aidl_lazy_test_1":    EXCEPTION_NO_FUZZER,
+		"aidl_lazy_test_2":    EXCEPTION_NO_FUZZER,
+		"aidl_lazy_test_quit": EXCEPTION_NO_FUZZER,
+		"aidl_lazy_cb_test":   EXCEPTION_NO_FUZZER,
+		"alarm":               EXCEPTION_NO_FUZZER,
+		"android.hardware.automotive.evs.IEvsEnumerator/default":         EXCEPTION_NO_FUZZER,
+		"android.os.UpdateEngineService":                                 []string{"update_engine_service_fuzzer"},
+		"android.os.UpdateEngineStableService":                           []string{"update_engine_service_fuzzer"},
+		"android.frameworks.automotive.display.ICarDisplayProxy/default": EXCEPTION_NO_FUZZER,
+		"android.security.apc":                                           EXCEPTION_NO_FUZZER,
+		"android.security.authorization":                                 []string{"authorization_service_fuzzer"},
+		"android.security.compat":                                        EXCEPTION_NO_FUZZER,
+		"android.security.dice.IDiceMaintenance":                         EXCEPTION_NO_FUZZER,
+		"android.security.dice.IDiceNode":                                EXCEPTION_NO_FUZZER,
+		"android.security.identity":                                      []string{"credstore_service_fuzzer"},
+		"android.security.keystore":                                      EXCEPTION_NO_FUZZER,
+		"android.security.legacykeystore":                                EXCEPTION_NO_FUZZER,
+		"android.security.maintenance":                                   EXCEPTION_NO_FUZZER,
+		"android.security.metrics":                                       EXCEPTION_NO_FUZZER,
+		"android.service.gatekeeper.IGateKeeperService":                  []string{"gatekeeperd_service_fuzzer"},
+		"android.system.composd":                                         EXCEPTION_NO_FUZZER,
 		// TODO(b/294158658): add fuzzer
 		"android.hardware.security.keymint.IRemotelyProvisionedComponent/avf": EXCEPTION_NO_FUZZER,
-		"android.system.virtualizationservice":                            EXCEPTION_NO_FUZZER,
-		"android.system.virtualizationservice_internal.IVfioHandler":      EXCEPTION_NO_FUZZER,
-		"android.system.virtualizationservice_internal.IVmnic":            EXCEPTION_NO_FUZZER,
-		"android.system.virtualizationmaintenance":                        EXCEPTION_NO_FUZZER,
-		"ambient_context":                                                 EXCEPTION_NO_FUZZER,
-		"app_binding":                                                     EXCEPTION_NO_FUZZER,
-		"app_hibernation":                                                 EXCEPTION_NO_FUZZER,
-		"app_integrity":                                                   EXCEPTION_NO_FUZZER,
-		"app_prediction":                                                  EXCEPTION_NO_FUZZER,
-		"app_search":                                                      EXCEPTION_NO_FUZZER,
-		"apexservice":                                                     EXCEPTION_NO_FUZZER,
-		"archive":                                                         EXCEPTION_NO_FUZZER,
-		"attestation_verification":                                        EXCEPTION_NO_FUZZER,
-		"blob_store":                                                      EXCEPTION_NO_FUZZER,
-		"gsiservice":                                                      EXCEPTION_NO_FUZZER,
-		"appops":                                                          EXCEPTION_NO_FUZZER,
-		"appwidget":                                                       EXCEPTION_NO_FUZZER,
-		"artd":                                                            []string{"artd_fuzzer"},
-		"artd_pre_reboot":                                                 []string{"artd_fuzzer"},
-		"assetatlas":                                                      EXCEPTION_NO_FUZZER,
-		"attention":                                                       EXCEPTION_NO_FUZZER,
-		"audio":                                                           EXCEPTION_NO_FUZZER,
-		"auth":                                                            EXCEPTION_NO_FUZZER,
-		"autofill":                                                        EXCEPTION_NO_FUZZER,
-		"background_install_control":                                      EXCEPTION_NO_FUZZER,
-		"backup":                                                          EXCEPTION_NO_FUZZER,
-		"batteryproperties":                                               EXCEPTION_NO_FUZZER,
-		"batterystats":                                                    EXCEPTION_NO_FUZZER,
-		"battery":                                                         EXCEPTION_NO_FUZZER,
-		"binder_calls_stats":                                              EXCEPTION_NO_FUZZER,
-		"biometric":                                                       EXCEPTION_NO_FUZZER,
-		"bluetooth_manager":                                               EXCEPTION_NO_FUZZER,
-		"bluetooth":                                                       EXCEPTION_NO_FUZZER,
-		"broadcastradio":                                                  EXCEPTION_NO_FUZZER,
-		"bugreport":                                                       EXCEPTION_NO_FUZZER,
-		"cacheinfo":                                                       EXCEPTION_NO_FUZZER,
-		"carrier_config":                                                  EXCEPTION_NO_FUZZER,
-		"clipboard":                                                       EXCEPTION_NO_FUZZER,
-		"cloudsearch":                                                     EXCEPTION_NO_FUZZER,
-		"cloudsearch_service":                                             EXCEPTION_NO_FUZZER,
-		"com.android.net.IProxyService":                                   EXCEPTION_NO_FUZZER,
-		"companiondevice":                                                 EXCEPTION_NO_FUZZER,
-		"communal":                                                        EXCEPTION_NO_FUZZER,
-		"platform_compat":                                                 EXCEPTION_NO_FUZZER,
-		"platform_compat_native":                                          EXCEPTION_NO_FUZZER,
-		"connectivity":                                                    EXCEPTION_NO_FUZZER,
-		"connectivity_native":                                             EXCEPTION_NO_FUZZER,
-		"connmetrics":                                                     EXCEPTION_NO_FUZZER,
-		"consumer_ir":                                                     EXCEPTION_NO_FUZZER,
-		"content":                                                         EXCEPTION_NO_FUZZER,
-		"content_capture":                                                 EXCEPTION_NO_FUZZER,
-		"content_suggestions":                                             EXCEPTION_NO_FUZZER,
-		"contexthub":                                                      EXCEPTION_NO_FUZZER,
-		"contextual_search":                                               EXCEPTION_NO_FUZZER,
-		"country_detector":                                                EXCEPTION_NO_FUZZER,
-		"coverage":                                                        EXCEPTION_NO_FUZZER,
-		"cpuinfo":                                                         EXCEPTION_NO_FUZZER,
-		"cpu_monitor":                                                     EXCEPTION_NO_FUZZER,
-		"credential":                                                      EXCEPTION_NO_FUZZER,
-		"crossprofileapps":                                                EXCEPTION_NO_FUZZER,
-		"dataloader_manager":                                              EXCEPTION_NO_FUZZER,
-		"dbinfo":                                                          EXCEPTION_NO_FUZZER,
-		"device_config":                                                   EXCEPTION_NO_FUZZER,
-		"device_config_updatable":                                         EXCEPTION_NO_FUZZER,
-		"device_policy":                                                   EXCEPTION_NO_FUZZER,
-		"device_identifiers":                                              EXCEPTION_NO_FUZZER,
-		"deviceidle":                                                      EXCEPTION_NO_FUZZER,
-		"device_lock":                                                     EXCEPTION_NO_FUZZER,
-		"device_state":                                                    EXCEPTION_NO_FUZZER,
-		"devicestoragemonitor":                                            EXCEPTION_NO_FUZZER,
-		"dexopt_chroot_setup":                                             []string{"dexopt_chroot_setup_fuzzer"},
-		"diskstats":                                                       EXCEPTION_NO_FUZZER,
-		"display":                                                         EXCEPTION_NO_FUZZER,
-		"dnsresolver":                                                     []string{"resolv_service_fuzzer"},
-		"domain_verification":                                             EXCEPTION_NO_FUZZER,
-		"color_display":                                                   EXCEPTION_NO_FUZZER,
-		"netd_listener":                                                   EXCEPTION_NO_FUZZER,
-		"network_watchlist":                                               EXCEPTION_NO_FUZZER,
-		"DockObserver":                                                    EXCEPTION_NO_FUZZER,
-		"dreams":                                                          EXCEPTION_NO_FUZZER,
-		"drm.drmManager":                                                  []string{"drmserver_fuzzer"},
-		"dropbox":                                                         EXCEPTION_NO_FUZZER,
-		"dumpstate":                                                       EXCEPTION_NO_FUZZER,
-		"dynamic_system":                                                  EXCEPTION_NO_FUZZER,
-		"econtroller":                                                     EXCEPTION_NO_FUZZER,
-		"ecm_enhanced_confirmation":                                       EXCEPTION_NO_FUZZER,
-		"emergency_affordance":                                            EXCEPTION_NO_FUZZER,
-		"euicc_card_controller":                                           EXCEPTION_NO_FUZZER,
-		"external_vibrator_service":                                       EXCEPTION_NO_FUZZER,
-		"ethernet":                                                        EXCEPTION_NO_FUZZER,
-		"face":                                                            EXCEPTION_NO_FUZZER,
-		"file_integrity":                                                  EXCEPTION_NO_FUZZER,
-		"fingerprint":                                                     EXCEPTION_NO_FUZZER,
-		"feature_flags":                                                   EXCEPTION_NO_FUZZER,
-		"font":                                                            EXCEPTION_NO_FUZZER,
+		"android.system.virtualizationservice":                                []string{"virtualizationmanager_fuzzer"},
+		"android.system.virtualizationservice_internal.IVfioHandler":          EXCEPTION_NO_FUZZER,
+		"android.system.virtualizationservice_internal.IVmnic":                EXCEPTION_NO_FUZZER,
+		"android.system.virtualizationmaintenance":                            EXCEPTION_NO_FUZZER,
+		"ambient_context":               EXCEPTION_NO_FUZZER,
+		"app_binding":                   EXCEPTION_NO_FUZZER,
+		"app_hibernation":               EXCEPTION_NO_FUZZER,
+		"app_integrity":                 EXCEPTION_NO_FUZZER,
+		"app_prediction":                EXCEPTION_NO_FUZZER,
+		"app_search":                    EXCEPTION_NO_FUZZER,
+		"apexservice":                   EXCEPTION_NO_FUZZER,
+		"archive":                       EXCEPTION_NO_FUZZER,
+		"attestation_verification":      EXCEPTION_NO_FUZZER,
+		"blob_store":                    EXCEPTION_NO_FUZZER,
+		"gsiservice":                    EXCEPTION_NO_FUZZER,
+		"appops":                        EXCEPTION_NO_FUZZER,
+		"appwidget":                     EXCEPTION_NO_FUZZER,
+		"artd":                          []string{"artd_fuzzer"},
+		"artd_pre_reboot":               []string{"artd_fuzzer"},
+		"assetatlas":                    EXCEPTION_NO_FUZZER,
+		"attention":                     EXCEPTION_NO_FUZZER,
+		"audio":                         EXCEPTION_NO_FUZZER,
+		"auth":                          EXCEPTION_NO_FUZZER,
+		"autofill":                      EXCEPTION_NO_FUZZER,
+		"background_install_control":    EXCEPTION_NO_FUZZER,
+		"backup":                        EXCEPTION_NO_FUZZER,
+		"batteryproperties":             EXCEPTION_NO_FUZZER,
+		"batterystats":                  EXCEPTION_NO_FUZZER,
+		"battery":                       EXCEPTION_NO_FUZZER,
+		"binder_calls_stats":            EXCEPTION_NO_FUZZER,
+		"biometric":                     EXCEPTION_NO_FUZZER,
+		"bluetooth_manager":             EXCEPTION_NO_FUZZER,
+		"bluetooth":                     EXCEPTION_NO_FUZZER,
+		"broadcastradio":                EXCEPTION_NO_FUZZER,
+		"bugreport":                     EXCEPTION_NO_FUZZER,
+		"cacheinfo":                     EXCEPTION_NO_FUZZER,
+		"carrier_config":                EXCEPTION_NO_FUZZER,
+		"clipboard":                     EXCEPTION_NO_FUZZER,
+		"cloudsearch":                   EXCEPTION_NO_FUZZER,
+		"cloudsearch_service":           EXCEPTION_NO_FUZZER,
+		"com.android.net.IProxyService": EXCEPTION_NO_FUZZER,
+		"companiondevice":               EXCEPTION_NO_FUZZER,
+		"communal":                      EXCEPTION_NO_FUZZER,
+		"platform_compat":               EXCEPTION_NO_FUZZER,
+		"platform_compat_native":        EXCEPTION_NO_FUZZER,
+		"connectivity":                  EXCEPTION_NO_FUZZER,
+		"connectivity_native":           EXCEPTION_NO_FUZZER,
+		"connmetrics":                   EXCEPTION_NO_FUZZER,
+		"consumer_ir":                   EXCEPTION_NO_FUZZER,
+		"content":                       EXCEPTION_NO_FUZZER,
+		"content_capture":               EXCEPTION_NO_FUZZER,
+		"content_suggestions":           EXCEPTION_NO_FUZZER,
+		"contexthub":                    EXCEPTION_NO_FUZZER,
+		"contextual_search":             EXCEPTION_NO_FUZZER,
+		"country_detector":              EXCEPTION_NO_FUZZER,
+		"coverage":                      EXCEPTION_NO_FUZZER,
+		"cpuinfo":                       EXCEPTION_NO_FUZZER,
+		"cpu_monitor":                   EXCEPTION_NO_FUZZER,
+		"credential":                    EXCEPTION_NO_FUZZER,
+		"crossprofileapps":              EXCEPTION_NO_FUZZER,
+		"dataloader_manager":            EXCEPTION_NO_FUZZER,
+		"dbinfo":                        EXCEPTION_NO_FUZZER,
+		"device_config":                 EXCEPTION_NO_FUZZER,
+		"device_config_updatable":       EXCEPTION_NO_FUZZER,
+		"device_policy":                 EXCEPTION_NO_FUZZER,
+		"device_identifiers":            EXCEPTION_NO_FUZZER,
+		"deviceidle":                    EXCEPTION_NO_FUZZER,
+		"device_lock":                   EXCEPTION_NO_FUZZER,
+		"device_state":                  EXCEPTION_NO_FUZZER,
+		"devicestoragemonitor":          EXCEPTION_NO_FUZZER,
+		"dexopt_chroot_setup":           []string{"dexopt_chroot_setup_fuzzer"},
+		"diskstats":                     EXCEPTION_NO_FUZZER,
+		"display":                       EXCEPTION_NO_FUZZER,
+		"dnsresolver":                   []string{"resolv_service_fuzzer"},
+		"domain_verification":           EXCEPTION_NO_FUZZER,
+		"color_display":                 EXCEPTION_NO_FUZZER,
+		"netd_listener":                 EXCEPTION_NO_FUZZER,
+		"network_watchlist":             EXCEPTION_NO_FUZZER,
+		"DockObserver":                  EXCEPTION_NO_FUZZER,
+		"dreams":                        EXCEPTION_NO_FUZZER,
+		"drm.drmManager":                []string{"drmserver_fuzzer"},
+		"dropbox":                       EXCEPTION_NO_FUZZER,
+		"dumpstate":                     EXCEPTION_NO_FUZZER,
+		"dynamic_system":                EXCEPTION_NO_FUZZER,
+		"econtroller":                   EXCEPTION_NO_FUZZER,
+		"ecm_enhanced_confirmation":     EXCEPTION_NO_FUZZER,
+		"emergency_affordance":          EXCEPTION_NO_FUZZER,
+		"euicc_card_controller":         EXCEPTION_NO_FUZZER,
+		"external_vibrator_service":     EXCEPTION_NO_FUZZER,
+		"ethernet":                      EXCEPTION_NO_FUZZER,
+		"face":                          EXCEPTION_NO_FUZZER,
+		"file_integrity":                EXCEPTION_NO_FUZZER,
+		"fingerprint":                   EXCEPTION_NO_FUZZER,
+		"feature_flags":                 EXCEPTION_NO_FUZZER,
+		"font":                          EXCEPTION_NO_FUZZER,
 		"android.hardware.fingerprint.IFingerprintDaemon": EXCEPTION_NO_FUZZER,
-		"game":                         EXCEPTION_NO_FUZZER,
-		"gfxinfo":                      EXCEPTION_NO_FUZZER,
-		"gnss_time_update_service":     EXCEPTION_NO_FUZZER,
-		"grammatical_inflection":       EXCEPTION_NO_FUZZER,
-		"graphicsstats":                EXCEPTION_NO_FUZZER,
-		"gpu":                          []string{"gpu_service_fuzzer"},
-		"hardware":                     EXCEPTION_NO_FUZZER,
-		"hardware_properties":          EXCEPTION_NO_FUZZER,
-		"hdmi_control":                 EXCEPTION_NO_FUZZER,
-		"healthconnect":                EXCEPTION_NO_FUZZER,
-		"ions":                         EXCEPTION_NO_FUZZER,
-		"idmap":                        EXCEPTION_NO_FUZZER,
-		"incident":                     []string{"incidentd_service_fuzzer"},
-		"incidentcompanion":            EXCEPTION_NO_FUZZER,
-		"inputflinger":                 EXCEPTION_NO_FUZZER,
-		"input_method":                 EXCEPTION_NO_FUZZER,
-		"input":                        EXCEPTION_NO_FUZZER,
-		"installd":                     []string{"installd_service_fuzzer"},
-		"iphonesubinfo_msim":           EXCEPTION_NO_FUZZER,
-		"iphonesubinfo2":               EXCEPTION_NO_FUZZER,
-		"iphonesubinfo":                EXCEPTION_NO_FUZZER,
-		"ims":                          EXCEPTION_NO_FUZZER,
-		"imms":                         EXCEPTION_NO_FUZZER,
-		"incremental":                  EXCEPTION_NO_FUZZER,
-		"ipsec":                        EXCEPTION_NO_FUZZER,
-		"ircsmessage":                  EXCEPTION_NO_FUZZER,
-		"iris":                         EXCEPTION_NO_FUZZER,
-		"isms_msim":                    EXCEPTION_NO_FUZZER,
-		"isms2":                        EXCEPTION_NO_FUZZER,
-		"isms":                         EXCEPTION_NO_FUZZER,
-		"isub":                         EXCEPTION_NO_FUZZER,
-		"jobscheduler":                 EXCEPTION_NO_FUZZER,
-		"launcherapps":                 EXCEPTION_NO_FUZZER,
-		"legacy_permission":            EXCEPTION_NO_FUZZER,
-		"lights":                       EXCEPTION_NO_FUZZER,
-		"locale":                       EXCEPTION_NO_FUZZER,
-		"location":                     EXCEPTION_NO_FUZZER,
-		"location_time_zone_manager":   EXCEPTION_NO_FUZZER,
-		"lock_settings":                EXCEPTION_NO_FUZZER,
-		"logcat":                       EXCEPTION_NO_FUZZER,
-		"logd":                         EXCEPTION_NO_FUZZER,
-		"looper_stats":                 EXCEPTION_NO_FUZZER,
-		"lpdump_service":               EXCEPTION_NO_FUZZER,
-		"mdns":                         EXCEPTION_NO_FUZZER,
-		"media.aaudio":                 EXCEPTION_NO_FUZZER,
-		"media.audio_flinger":          []string{"audioflinger_aidl_fuzzer"},
-		"media.audio_policy":           []string{"audiopolicy_aidl_fuzzer"},
-		"media.camera":                 []string{"camera_service_aidl_fuzzer"},
-		"media.camera.proxy":           EXCEPTION_NO_FUZZER,
-		"media.log":                    EXCEPTION_NO_FUZZER,
-		"media.player":                 []string{"media_player_service_fuzzer"},
-		"media.metrics":                []string{"mediametrics_aidl_fuzzer"},
-		"media.extractor":              []string{"mediaextractor_service_fuzzer"},
-		"media.transcoding":            EXCEPTION_NO_FUZZER,
-		"media.resource_manager":       []string{"resourcemanager_service_fuzzer", "mediaresourcemanager_fuzzer"},
-		"media.resource_observer":      EXCEPTION_NO_FUZZER,
-		"media.sound_trigger_hw":       EXCEPTION_NO_FUZZER,
-		"media.drm":                    EXCEPTION_NO_FUZZER,
-		"media.tuner":                  EXCEPTION_NO_FUZZER,
-		"media_communication":          EXCEPTION_NO_FUZZER,
-		"media_metrics":                EXCEPTION_NO_FUZZER,
-		"media_projection":             EXCEPTION_NO_FUZZER,
-		"media_resource_monitor":       EXCEPTION_NO_FUZZER,
-		"media_router":                 EXCEPTION_NO_FUZZER,
-		"media_session":                EXCEPTION_NO_FUZZER,
-		"meminfo":                      EXCEPTION_NO_FUZZER,
-		"memtrack.proxy":               EXCEPTION_NO_FUZZER,
-		"midi":                         EXCEPTION_NO_FUZZER,
-		"mount":                        EXCEPTION_NO_FUZZER,
-		"music_recognition":            EXCEPTION_NO_FUZZER,
-		"nearby":                       EXCEPTION_NO_FUZZER,
-		"netd":                         []string{"netd_native_service_fuzzer"},
-		"netpolicy":                    EXCEPTION_NO_FUZZER,
-		"netstats":                     EXCEPTION_NO_FUZZER,
-		"network_stack":                EXCEPTION_NO_FUZZER,
-		"network_management":           EXCEPTION_NO_FUZZER,
-		"network_score":                EXCEPTION_NO_FUZZER,
-		"network_time_update_service":  EXCEPTION_NO_FUZZER,
-		"nfc":                          EXCEPTION_NO_FUZZER,
-		"notification":                 EXCEPTION_NO_FUZZER,
-		"oem_lock":                     EXCEPTION_NO_FUZZER,
+		"game":                                   EXCEPTION_NO_FUZZER,
+		"gfxinfo":                                EXCEPTION_NO_FUZZER,
+		"gnss_time_update_service":               EXCEPTION_NO_FUZZER,
+		"grammatical_inflection":                 EXCEPTION_NO_FUZZER,
+		"graphicsstats":                          EXCEPTION_NO_FUZZER,
+		"gpu":                                    []string{"gpu_service_fuzzer"},
+		"hardware":                               EXCEPTION_NO_FUZZER,
+		"hardware_properties":                    EXCEPTION_NO_FUZZER,
+		"hdmi_control":                           EXCEPTION_NO_FUZZER,
+		"healthconnect":                          EXCEPTION_NO_FUZZER,
+		"ions":                                   EXCEPTION_NO_FUZZER,
+		"idmap":                                  EXCEPTION_NO_FUZZER,
+		"incident":                               []string{"incidentd_service_fuzzer"},
+		"incidentcompanion":                      EXCEPTION_NO_FUZZER,
+		"inputflinger":                           EXCEPTION_NO_FUZZER,
+		"input_method":                           EXCEPTION_NO_FUZZER,
+		"input":                                  EXCEPTION_NO_FUZZER,
+		"installd":                               []string{"installd_service_fuzzer"},
+		"iphonesubinfo_msim":                     EXCEPTION_NO_FUZZER,
+		"iphonesubinfo2":                         EXCEPTION_NO_FUZZER,
+		"iphonesubinfo":                          EXCEPTION_NO_FUZZER,
+		"ims":                                    EXCEPTION_NO_FUZZER,
+		"imms":                                   EXCEPTION_NO_FUZZER,
+		"incremental":                            EXCEPTION_NO_FUZZER,
+		"ipsec":                                  EXCEPTION_NO_FUZZER,
+		"ircsmessage":                            EXCEPTION_NO_FUZZER,
+		"iris":                                   EXCEPTION_NO_FUZZER,
+		"isms_msim":                              EXCEPTION_NO_FUZZER,
+		"isms2":                                  EXCEPTION_NO_FUZZER,
+		"isms":                                   EXCEPTION_NO_FUZZER,
+		"isub":                                   EXCEPTION_NO_FUZZER,
+		"jobscheduler":                           EXCEPTION_NO_FUZZER,
+		"launcherapps":                           EXCEPTION_NO_FUZZER,
+		"legacy_permission":                      EXCEPTION_NO_FUZZER,
+		"lights":                                 EXCEPTION_NO_FUZZER,
+		"locale":                                 EXCEPTION_NO_FUZZER,
+		"location":                               EXCEPTION_NO_FUZZER,
+		"location_time_zone_manager":             EXCEPTION_NO_FUZZER,
+		"lock_settings":                          EXCEPTION_NO_FUZZER,
+		"logcat":                                 EXCEPTION_NO_FUZZER,
+		"logd":                                   EXCEPTION_NO_FUZZER,
+		"looper_stats":                           EXCEPTION_NO_FUZZER,
+		"lpdump_service":                         EXCEPTION_NO_FUZZER,
+		"mdns":                                   EXCEPTION_NO_FUZZER,
+		"media.aaudio":                           EXCEPTION_NO_FUZZER,
+		"media.audio_flinger":                    []string{"audioflinger_aidl_fuzzer"},
+		"media.audio_policy":                     []string{"audiopolicy_aidl_fuzzer"},
+		"media.camera":                           []string{"camera_service_aidl_fuzzer"},
+		"media.camera.proxy":                     EXCEPTION_NO_FUZZER,
+		"media.log":                              EXCEPTION_NO_FUZZER,
+		"media.player":                           []string{"media_player_service_fuzzer"},
+		"media.metrics":                          []string{"mediametrics_aidl_fuzzer"},
+		"media.extractor":                        []string{"mediaextractor_service_fuzzer"},
+		"media.transcoding":                      EXCEPTION_NO_FUZZER,
+		"media.resource_manager":                 []string{"resourcemanager_service_fuzzer", "mediaresourcemanager_fuzzer"},
+		"media.resource_observer":                EXCEPTION_NO_FUZZER,
+		"media.sound_trigger_hw":                 EXCEPTION_NO_FUZZER,
+		"media.drm":                              EXCEPTION_NO_FUZZER,
+		"media.tuner":                            EXCEPTION_NO_FUZZER,
+		"media_communication":                    EXCEPTION_NO_FUZZER,
+		"media_metrics":                          EXCEPTION_NO_FUZZER,
+		"media_projection":                       EXCEPTION_NO_FUZZER,
+		"media_resource_monitor":                 EXCEPTION_NO_FUZZER,
+		"media_router":                           EXCEPTION_NO_FUZZER,
+		"media_session":                          EXCEPTION_NO_FUZZER,
+		"meminfo":                                EXCEPTION_NO_FUZZER,
+		"memtrack.proxy":                         EXCEPTION_NO_FUZZER,
+		"midi":                                   EXCEPTION_NO_FUZZER,
+		"mount":                                  EXCEPTION_NO_FUZZER,
+		"music_recognition":                      EXCEPTION_NO_FUZZER,
+		"nearby":                                 EXCEPTION_NO_FUZZER,
+		"netd":                                   []string{"netd_native_service_fuzzer"},
+		"netpolicy":                              EXCEPTION_NO_FUZZER,
+		"netstats":                               EXCEPTION_NO_FUZZER,
+		"network_stack":                          EXCEPTION_NO_FUZZER,
+		"network_management":                     EXCEPTION_NO_FUZZER,
+		"network_score":                          EXCEPTION_NO_FUZZER,
+		"network_time_update_service":            EXCEPTION_NO_FUZZER,
+		"nfc":                                    EXCEPTION_NO_FUZZER,
+		"notification":                           EXCEPTION_NO_FUZZER,
+		"oem_lock":                               EXCEPTION_NO_FUZZER,
 		"ondevicepersonalization_system_service": EXCEPTION_NO_FUZZER,
-		"on_device_intelligence":             EXCEPTION_NO_FUZZER,
-		"otadexopt":                    EXCEPTION_NO_FUZZER,
-		"ot_daemon":                    []string{"ot_daemon_service_fuzzer"},
-		"overlay":                      EXCEPTION_NO_FUZZER,
-		"pac_proxy":                    EXCEPTION_NO_FUZZER,
-		"package":                      EXCEPTION_NO_FUZZER,
-		"package_native":               EXCEPTION_NO_FUZZER,
-		"people":                       EXCEPTION_NO_FUZZER,
-		"performance_hint":             EXCEPTION_NO_FUZZER,
-		"permission":                   EXCEPTION_NO_FUZZER,
-		"permissionmgr":                EXCEPTION_NO_FUZZER,
-		"permission_checker":           EXCEPTION_NO_FUZZER,
-		"persistent_data_block":        EXCEPTION_NO_FUZZER,
-		"phone_msim":                   EXCEPTION_NO_FUZZER,
-		"phone1":                       EXCEPTION_NO_FUZZER,
-		"phone2":                       EXCEPTION_NO_FUZZER,
-		"phone":                        EXCEPTION_NO_FUZZER,
-		"pinner":                       EXCEPTION_NO_FUZZER,
-		"powerstats":                   EXCEPTION_NO_FUZZER,
-		"power":                        EXCEPTION_NO_FUZZER,
-		"print":                        EXCEPTION_NO_FUZZER,
-		"processinfo":                  EXCEPTION_NO_FUZZER,
-		"procstats":                    EXCEPTION_NO_FUZZER,
-		"profcollectd":                 EXCEPTION_NO_FUZZER,
-		"profiling_service":            EXCEPTION_NO_FUZZER,
-		"radio.phonesubinfo":           EXCEPTION_NO_FUZZER,
-		"radio.phone":                  EXCEPTION_NO_FUZZER,
-		"radio.sms":                    EXCEPTION_NO_FUZZER,
-		"rcs":                          EXCEPTION_NO_FUZZER,
-		"reboot_readiness":             EXCEPTION_NO_FUZZER,
-		"recovery":                     EXCEPTION_NO_FUZZER,
-		"remote_auth":                  EXCEPTION_NO_FUZZER,
-		"remote_provisioning":          EXCEPTION_NO_FUZZER,
-		"resolver":                     EXCEPTION_NO_FUZZER,
-		"resources":                    EXCEPTION_NO_FUZZER,
-		"restrictions":                 EXCEPTION_NO_FUZZER,
-		"rkpd.registrar":               EXCEPTION_NO_FUZZER,
-		"rkpd.refresh":                 EXCEPTION_NO_FUZZER,
-		"role":                         EXCEPTION_NO_FUZZER,
-		"rollback":                     EXCEPTION_NO_FUZZER,
-		"rttmanager":                   EXCEPTION_NO_FUZZER,
-		"runtime":                      EXCEPTION_NO_FUZZER,
-		"safety_center":                EXCEPTION_NO_FUZZER,
-		"samplingprofiler":             EXCEPTION_NO_FUZZER,
-		"scheduling_policy":            EXCEPTION_NO_FUZZER,
-		"search":                       EXCEPTION_NO_FUZZER,
-		"search_ui":                    EXCEPTION_NO_FUZZER,
-		"secure_element":               EXCEPTION_NO_FUZZER,
-		"security_state":               EXCEPTION_NO_FUZZER,
-		"sec_key_att_app_id_provider":  EXCEPTION_NO_FUZZER,
-		"selection_toolbar":            EXCEPTION_NO_FUZZER,
-		"sensitive_content_protection_service": EXCEPTION_NO_FUZZER,
-		"sensorservice":                EXCEPTION_NO_FUZZER,
-		"sensor_privacy":               EXCEPTION_NO_FUZZER,
-		"serial":                       EXCEPTION_NO_FUZZER,
-		"servicediscovery":             EXCEPTION_NO_FUZZER,
-		"manager":                      []string{"servicemanager_fuzzer"},
-		"settings":                     EXCEPTION_NO_FUZZER,
-		"shortcut":                     EXCEPTION_NO_FUZZER,
-		"simphonebook_msim":            EXCEPTION_NO_FUZZER,
-		"simphonebook2":                EXCEPTION_NO_FUZZER,
-		"simphonebook":                 EXCEPTION_NO_FUZZER,
-		"sip":                          EXCEPTION_NO_FUZZER,
-		"slice":                        EXCEPTION_NO_FUZZER,
-		"smartspace":                   EXCEPTION_NO_FUZZER,
-		"speech_recognition":           EXCEPTION_NO_FUZZER,
-		"stats":                        []string{"statsd_service_fuzzer"},
-		"statsbootstrap":               EXCEPTION_NO_FUZZER,
-		"statscompanion":               EXCEPTION_NO_FUZZER,
-		"statsmanager":                 EXCEPTION_NO_FUZZER,
-		"soundtrigger":                 EXCEPTION_NO_FUZZER,
-		"soundtrigger_middleware":      EXCEPTION_NO_FUZZER,
-		"statusbar":                    EXCEPTION_NO_FUZZER,
-		"storaged":                     []string{"storaged_service_fuzzer"},
-		"storaged_pri":                 []string{"storaged_private_service_fuzzer"},
-		"storagestats":                 EXCEPTION_NO_FUZZER,
-		"sdk_sandbox":                  EXCEPTION_NO_FUZZER,
-		"SurfaceFlinger":               EXCEPTION_NO_FUZZER,
-		"SurfaceFlingerAIDL":           EXCEPTION_NO_FUZZER,
-		"suspend_control":              []string{"suspend_service_fuzzer"},
-		"suspend_control_internal":     []string{"suspend_service_internal_fuzzer"},
-		"system_config":                EXCEPTION_NO_FUZZER,
-		"system_server_dumper":         EXCEPTION_NO_FUZZER,
-		"system_update":                EXCEPTION_NO_FUZZER,
-		"tare":                         EXCEPTION_NO_FUZZER,
-		"task":                         EXCEPTION_NO_FUZZER,
-		"telecom":                      EXCEPTION_NO_FUZZER,
-		"telephony.registry":           EXCEPTION_NO_FUZZER,
-		"telephony_ims":                EXCEPTION_NO_FUZZER,
-		"testharness":                  EXCEPTION_NO_FUZZER,
-		"tethering":                    EXCEPTION_NO_FUZZER,
-		"textclassification":           EXCEPTION_NO_FUZZER,
-		"textservices":                 EXCEPTION_NO_FUZZER,
-		"texttospeech":                 EXCEPTION_NO_FUZZER,
-		"thread_network":               EXCEPTION_NO_FUZZER,
-		"time_detector":                EXCEPTION_NO_FUZZER,
-		"time_zone_detector":           EXCEPTION_NO_FUZZER,
-		"thermalservice":               EXCEPTION_NO_FUZZER,
-		"tracing.proxy":                EXCEPTION_NO_FUZZER,
-		"translation":                  EXCEPTION_NO_FUZZER,
-		"transparency":                 EXCEPTION_NO_FUZZER,
-		"trust":                        EXCEPTION_NO_FUZZER,
-		"tv_ad":                        EXCEPTION_NO_FUZZER,
-		"tv_interactive_app":           EXCEPTION_NO_FUZZER,
-		"tv_input":                     EXCEPTION_NO_FUZZER,
-		"tv_tuner_resource_mgr":        EXCEPTION_NO_FUZZER,
-		"uce":                          EXCEPTION_NO_FUZZER,
-		"uimode":                       EXCEPTION_NO_FUZZER,
-		"updatelock":                   EXCEPTION_NO_FUZZER,
-		"uri_grants":                   EXCEPTION_NO_FUZZER,
-		"usagestats":                   EXCEPTION_NO_FUZZER,
-		"usb":                          EXCEPTION_NO_FUZZER,
-		"user":                         EXCEPTION_NO_FUZZER,
-		"uwb":                          EXCEPTION_NO_FUZZER,
-		"vcn_management":               EXCEPTION_NO_FUZZER,
-		"vibrator":                     EXCEPTION_NO_FUZZER,
-		"vibrator_manager":             EXCEPTION_NO_FUZZER,
-		"virtualdevice":                EXCEPTION_NO_FUZZER,
-		"virtualdevice_native":         EXCEPTION_NO_FUZZER,
-		"virtual_camera":               []string{"virtual_camera_fuzzer"},
-		"virtual_touchpad":             EXCEPTION_NO_FUZZER,
-		"voiceinteraction":             EXCEPTION_NO_FUZZER,
-		"vold":                         []string{"vold_native_service_fuzzer"},
-		"vpn_management":               EXCEPTION_NO_FUZZER,
-		"vrmanager":                    EXCEPTION_NO_FUZZER,
-		"wallpaper":                    EXCEPTION_NO_FUZZER,
-		"wallpaper_effects_generation": EXCEPTION_NO_FUZZER,
-		"wearable_sensing":             EXCEPTION_NO_FUZZER,
-		"webviewupdate":                EXCEPTION_NO_FUZZER,
-		"wifip2p":                      EXCEPTION_NO_FUZZER,
-		"wifiscanner":                  EXCEPTION_NO_FUZZER,
-		"wifi":                         EXCEPTION_NO_FUZZER,
-		"wifinl80211":                  []string{"wificond_service_fuzzer"},
-		"wifiaware":                    EXCEPTION_NO_FUZZER,
-		"wifirtt":                      EXCEPTION_NO_FUZZER,
-		"window":                       EXCEPTION_NO_FUZZER,
-		"*":                            EXCEPTION_NO_FUZZER,
+		"on_device_intelligence":                 EXCEPTION_NO_FUZZER,
+		"otadexopt":                              EXCEPTION_NO_FUZZER,
+		"ot_daemon":                              []string{"ot_daemon_service_fuzzer"},
+		"overlay":                                EXCEPTION_NO_FUZZER,
+		"pac_proxy":                              EXCEPTION_NO_FUZZER,
+		"package":                                EXCEPTION_NO_FUZZER,
+		"package_native":                         EXCEPTION_NO_FUZZER,
+		"people":                                 EXCEPTION_NO_FUZZER,
+		"performance_hint":                       EXCEPTION_NO_FUZZER,
+		"permission":                             EXCEPTION_NO_FUZZER,
+		"permissionmgr":                          EXCEPTION_NO_FUZZER,
+		"permission_checker":                     EXCEPTION_NO_FUZZER,
+		"persistent_data_block":                  EXCEPTION_NO_FUZZER,
+		"phone_msim":                             EXCEPTION_NO_FUZZER,
+		"phone1":                                 EXCEPTION_NO_FUZZER,
+		"phone2":                                 EXCEPTION_NO_FUZZER,
+		"phone":                                  EXCEPTION_NO_FUZZER,
+		"pinner":                                 EXCEPTION_NO_FUZZER,
+		"powerstats":                             EXCEPTION_NO_FUZZER,
+		"power":                                  EXCEPTION_NO_FUZZER,
+		"print":                                  EXCEPTION_NO_FUZZER,
+		"processinfo":                            EXCEPTION_NO_FUZZER,
+		"procstats":                              EXCEPTION_NO_FUZZER,
+		"profcollectd":                           EXCEPTION_NO_FUZZER,
+		"profiling_service":                      EXCEPTION_NO_FUZZER,
+		"radio.phonesubinfo":                     EXCEPTION_NO_FUZZER,
+		"radio.phone":                            EXCEPTION_NO_FUZZER,
+		"radio.sms":                              EXCEPTION_NO_FUZZER,
+		"rcs":                                    EXCEPTION_NO_FUZZER,
+		"reboot_readiness":                       EXCEPTION_NO_FUZZER,
+		"recovery":                               EXCEPTION_NO_FUZZER,
+		"remote_auth":                            EXCEPTION_NO_FUZZER,
+		"remote_provisioning":                    EXCEPTION_NO_FUZZER,
+		"resolver":                               EXCEPTION_NO_FUZZER,
+		"resources":                              EXCEPTION_NO_FUZZER,
+		"restrictions":                           EXCEPTION_NO_FUZZER,
+		"rkpd.registrar":                         EXCEPTION_NO_FUZZER,
+		"rkpd.refresh":                           EXCEPTION_NO_FUZZER,
+		"role":                                   EXCEPTION_NO_FUZZER,
+		"rollback":                               EXCEPTION_NO_FUZZER,
+		"rttmanager":                             EXCEPTION_NO_FUZZER,
+		"runtime":                                EXCEPTION_NO_FUZZER,
+		"safety_center":                          EXCEPTION_NO_FUZZER,
+		"samplingprofiler":                       EXCEPTION_NO_FUZZER,
+		"scheduling_policy":                      EXCEPTION_NO_FUZZER,
+		"search":                                 EXCEPTION_NO_FUZZER,
+		"search_ui":                              EXCEPTION_NO_FUZZER,
+		"secure_element":                         EXCEPTION_NO_FUZZER,
+		"security_state":                         EXCEPTION_NO_FUZZER,
+		"sec_key_att_app_id_provider":            EXCEPTION_NO_FUZZER,
+		"selection_toolbar":                      EXCEPTION_NO_FUZZER,
+		"sensitive_content_protection_service":   EXCEPTION_NO_FUZZER,
+		"sensorservice":                          EXCEPTION_NO_FUZZER,
+		"sensor_privacy":                         EXCEPTION_NO_FUZZER,
+		"serial":                                 EXCEPTION_NO_FUZZER,
+		"servicediscovery":                       EXCEPTION_NO_FUZZER,
+		"manager":                                []string{"servicemanager_fuzzer"},
+		"settings":                               EXCEPTION_NO_FUZZER,
+		"shortcut":                               EXCEPTION_NO_FUZZER,
+		"simphonebook_msim":                      EXCEPTION_NO_FUZZER,
+		"simphonebook2":                          EXCEPTION_NO_FUZZER,
+		"simphonebook":                           EXCEPTION_NO_FUZZER,
+		"sip":                                    EXCEPTION_NO_FUZZER,
+		"slice":                                  EXCEPTION_NO_FUZZER,
+		"smartspace":                             EXCEPTION_NO_FUZZER,
+		"speech_recognition":                     EXCEPTION_NO_FUZZER,
+		"stats":                                  []string{"statsd_service_fuzzer"},
+		"statsbootstrap":                         EXCEPTION_NO_FUZZER,
+		"statscompanion":                         EXCEPTION_NO_FUZZER,
+		"statsmanager":                           EXCEPTION_NO_FUZZER,
+		"soundtrigger":                           EXCEPTION_NO_FUZZER,
+		"soundtrigger_middleware":                EXCEPTION_NO_FUZZER,
+		"statusbar":                              EXCEPTION_NO_FUZZER,
+		"storaged":                               []string{"storaged_service_fuzzer"},
+		"storaged_pri":                           []string{"storaged_private_service_fuzzer"},
+		"storagestats":                           EXCEPTION_NO_FUZZER,
+		"sdk_sandbox":                            EXCEPTION_NO_FUZZER,
+		"SurfaceFlinger":                         EXCEPTION_NO_FUZZER,
+		"SurfaceFlingerAIDL":                     EXCEPTION_NO_FUZZER,
+		"suspend_control":                        []string{"suspend_service_fuzzer"},
+		"suspend_control_internal":               []string{"suspend_service_internal_fuzzer"},
+		"system_config":                          EXCEPTION_NO_FUZZER,
+		"system_server_dumper":                   EXCEPTION_NO_FUZZER,
+		"system_update":                          EXCEPTION_NO_FUZZER,
+		"tare":                                   EXCEPTION_NO_FUZZER,
+		"task":                                   EXCEPTION_NO_FUZZER,
+		"telecom":                                EXCEPTION_NO_FUZZER,
+		"telephony.registry":                     EXCEPTION_NO_FUZZER,
+		"telephony_ims":                          EXCEPTION_NO_FUZZER,
+		"testharness":                            EXCEPTION_NO_FUZZER,
+		"tethering":                              EXCEPTION_NO_FUZZER,
+		"textclassification":                     EXCEPTION_NO_FUZZER,
+		"textservices":                           EXCEPTION_NO_FUZZER,
+		"texttospeech":                           EXCEPTION_NO_FUZZER,
+		"thread_network":                         EXCEPTION_NO_FUZZER,
+		"time_detector":                          EXCEPTION_NO_FUZZER,
+		"time_zone_detector":                     EXCEPTION_NO_FUZZER,
+		"thermalservice":                         EXCEPTION_NO_FUZZER,
+		"tracing.proxy":                          EXCEPTION_NO_FUZZER,
+		"translation":                            EXCEPTION_NO_FUZZER,
+		"transparency":                           EXCEPTION_NO_FUZZER,
+		"trust":                                  EXCEPTION_NO_FUZZER,
+		"tv_ad":                                  EXCEPTION_NO_FUZZER,
+		"tv_interactive_app":                     EXCEPTION_NO_FUZZER,
+		"tv_input":                               EXCEPTION_NO_FUZZER,
+		"tv_tuner_resource_mgr":                  EXCEPTION_NO_FUZZER,
+		"uce":                                    EXCEPTION_NO_FUZZER,
+		"uimode":                                 EXCEPTION_NO_FUZZER,
+		"updatelock":                             EXCEPTION_NO_FUZZER,
+		"uri_grants":                             EXCEPTION_NO_FUZZER,
+		"usagestats":                             EXCEPTION_NO_FUZZER,
+		"usb":                                    EXCEPTION_NO_FUZZER,
+		"user":                                   EXCEPTION_NO_FUZZER,
+		"uwb":                                    EXCEPTION_NO_FUZZER,
+		"vcn_management":                         EXCEPTION_NO_FUZZER,
+		"vibrator":                               EXCEPTION_NO_FUZZER,
+		"vibrator_manager":                       EXCEPTION_NO_FUZZER,
+		"virtualdevice":                          EXCEPTION_NO_FUZZER,
+		"virtualdevice_native":                   EXCEPTION_NO_FUZZER,
+		"virtual_camera":                         []string{"virtual_camera_fuzzer"},
+		"virtual_touchpad":                       EXCEPTION_NO_FUZZER,
+		"voiceinteraction":                       EXCEPTION_NO_FUZZER,
+		"vold":                                   []string{"vold_native_service_fuzzer"},
+		"vpn_management":                         EXCEPTION_NO_FUZZER,
+		"vrmanager":                              EXCEPTION_NO_FUZZER,
+		"wallpaper":                              EXCEPTION_NO_FUZZER,
+		"wallpaper_effects_generation":           EXCEPTION_NO_FUZZER,
+		"wearable_sensing":                       EXCEPTION_NO_FUZZER,
+		"webviewupdate":                          EXCEPTION_NO_FUZZER,
+		"wifip2p":                                EXCEPTION_NO_FUZZER,
+		"wifiscanner":                            EXCEPTION_NO_FUZZER,
+		"wifi":                                   EXCEPTION_NO_FUZZER,
+		"wifinl80211":                            []string{"wificond_service_fuzzer"},
+		"wifiaware":                              EXCEPTION_NO_FUZZER,
+		"wifirtt":                                EXCEPTION_NO_FUZZER,
+		"window":                                 EXCEPTION_NO_FUZZER,
+		"*":                                      EXCEPTION_NO_FUZZER,
 	}
 )
diff --git a/microdroid/system/private/domain.te b/microdroid/system/private/domain.te
index 118425a..7361462 100644
--- a/microdroid/system/private/domain.te
+++ b/microdroid/system/private/domain.te
@@ -200,6 +200,10 @@
 allow domain apex_mnt_dir:dir { getattr search };
 allow domain apex_mnt_dir:lnk_file r_file_perms;
 
+# Allow reading /sys/kernel/mm/pgsize_migration/enabled
+allow domain sysfs_pgsize_migration:dir search;
+allow domain sysfs_pgsize_migration:file r_file_perms;
+
 # globally readable properties
 get_prop(domain, arm64_memtag_prop)
 get_prop(domain, bootloader_prop)
@@ -545,3 +549,7 @@
 
 # Only crash_dump is allowed to access ptrace
 neverallow { domain -crash_dump } domain:process ptrace;
+
+# Only init is allowed to write sysfs_pgsize_migration;
+# ueventd needs write access to all sysfs files.
+neverallow { domain -init -vendor_init -ueventd } sysfs_pgsize_migration:file no_w_file_perms;
diff --git a/microdroid/system/private/file.te b/microdroid/system/private/file.te
index e250c35..82a5564 100644
--- a/microdroid/system/private/file.te
+++ b/microdroid/system/private/file.te
@@ -30,3 +30,7 @@
 
 # /data/misc/perfetto-configs for perfetto configs
 type perfetto_configs_data_file, file_type, data_file_type, core_data_file_type;
+
+
+# Type for /sys/kernel/mm/pgsize_migration/enabled
+type sysfs_pgsize_migration, fs_type, sysfs_type;
diff --git a/microdroid/system/private/genfs_contexts b/microdroid/system/private/genfs_contexts
index 13ce685..8938ef2 100644
--- a/microdroid/system/private/genfs_contexts
+++ b/microdroid/system/private/genfs_contexts
@@ -159,6 +159,7 @@
 genfscon sysfs /kernel/ion u:object_r:sysfs_ion:s0
 genfscon sysfs /kernel/ipv4 u:object_r:sysfs_ipv4:s0
 genfscon sysfs /kernel/mm/transparent_hugepage u:object_r:sysfs_transparent_hugepage:s0
+genfscon sysfs /kernel/mm/pgsize_migration/enabled u:object_r:sysfs_pgsize_migration:s0
 genfscon sysfs /kernel/notes u:object_r:sysfs_kernel_notes:s0
 genfscon sysfs /kernel/uevent_helper u:object_r:sysfs_usermodehelper:s0
 genfscon sysfs /kernel/wakeup_reasons u:object_r:sysfs_wakeup_reasons:s0
diff --git a/microdroid/system/private/init.te b/microdroid/system/private/init.te
index 4441d12..67af209 100644
--- a/microdroid/system/private/init.te
+++ b/microdroid/system/private/init.te
@@ -303,6 +303,7 @@
   sysfs_power
   sysfs_fs_f2fs
   sysfs_dm
+  sysfs_pgsize_migration
 }:file w_file_perms;
 
 allow init {
diff --git a/private/artd.te b/private/artd.te
index f74a472..e6a6aaa 100644
--- a/private/artd.te
+++ b/private/artd.te
@@ -159,6 +159,9 @@
 domain_auto_trans(artd, derive_classpath_exec, derive_classpath)
 domain_auto_trans(artd, odrefresh_exec, odrefresh)
 
+# Allow sending sigkill to subprocesses.
+allow artd { derive_classpath odrefresh }:process sigkill;
+
 # Allow accessing Pre-reboot Dexopt files.
 allow artd pre_reboot_dexopt_file:dir { getattr search };
 
diff --git a/private/hal_power.te b/private/hal_power.te
index aae32a0..1eb10a1 100644
--- a/private/hal_power.te
+++ b/private/hal_power.te
@@ -7,3 +7,6 @@
 
 binder_call(hal_power_server, servicemanager)
 binder_call(hal_power_client, servicemanager)
+
+# power HAL sets dex2oat performance tuning properties
+set_prop(hal_power_server, dalvik_dynamic_config_prop)
diff --git a/private/property.te b/private/property.te
index a5a1d07..3b7fad3 100644
--- a/private/property.te
+++ b/private/property.te
@@ -357,12 +357,21 @@
     -nfc_prop
     -powerctl_prop
     -radio_prop
+    -dalvik_dynamic_config_prop
   }:file no_rw_file_perms;
 
   neverallow {
     domain
     -coredomain
     -appdomain
+    -vendor_init
+    -hal_power_server
+  } dalvik_dynamic_config_prop:file no_rw_file_perms;
+
+  neverallow {
+    domain
+    -coredomain
+    -appdomain
     -hal_nfc_server
   } {
     nfc_prop
diff --git a/private/shell.te b/private/shell.te
index dbdd132..263db8c 100644
--- a/private/shell.te
+++ b/private/shell.te
@@ -430,6 +430,12 @@
 # Allow reads (but not writes) of the MGLRU state
 allow shell sysfs_lru_gen_enabled:file r_file_perms;
 
+# Allow communicating with the VM terminal.
+userdebug_or_eng(`
+  allow shell vmlauncher_app_devpts:chr_file rw_file_perms;
+  allowxperm shell vmlauncher_app_devpts:chr_file ioctl unpriv_tty_ioctls;
+')
+
 # Allow access to ion memory allocation device.
 allow shell ion_device:chr_file rw_file_perms;
 
diff --git a/private/vmlauncher_app.te b/private/vmlauncher_app.te
index dcc4f55..f0f372b 100644
--- a/private/vmlauncher_app.te
+++ b/private/vmlauncher_app.te
@@ -16,3 +16,10 @@
   allow vmlauncher_app virtualizationservice:binder call;
   allow vmlauncher_app crosvm:binder { call transfer };
 ')
+
+userdebug_or_eng(`
+  # Create pty/pts and connect it to the guest terminal.
+  create_pty(vmlauncher_app)
+  # Allow other processes to access the pts.
+  allow vmlauncher_app vmlauncher_app_devpts:chr_file setattr;
+')