diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c
index ce4afb3b9e1c..5eb5ab1f9532 100644
--- a/android/abi_gki_aarch64_db845c
+++ b/android/abi_gki_aarch64_db845c
@@ -610,7 +610,6 @@
   unregister_chrdev_region
   unregister_reboot_notifier
   unregister_rpmsg_driver
-  usb_add_hcd
   usb_amd_dev_put
   usb_amd_quirk_pll_check
   usb_amd_quirk_pll_disable
@@ -618,19 +617,12 @@
   usb_debug_root
   usb_deregister
   usb_disabled
-  usb_hcd_check_unlink_urb
-  usb_hcd_giveback_urb
   usb_hc_died
-  usb_hcd_is_primary_hcd
-  usb_hcd_link_urb_to_ep
   usb_hcd_pci_pm_ops
   usb_hcd_pci_probe
   usb_hcd_pci_remove
   usb_hcd_pci_shutdown
   usb_hcd_platform_shutdown
-  usb_hcd_poll_rh_status
-  usb_hcd_resume_root_hub
-  usb_hcd_unlink_urb_from_ep
   usbnet_disconnect
   usbnet_get_endpoints
   usbnet_get_msglevel
@@ -652,9 +644,7 @@
   usbnet_write_cmd
   usbnet_write_cmd_async
   usbnet_write_cmd_nopm
-  usb_put_hcd
   usb_register_driver
-  usb_remove_hcd
   usb_root_hub_lost_power
   usleep_range
   vabits_actual
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index ad54130aa85f..b205348863fb 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -2250,7 +2250,6 @@
   up_write
   usb_add_gadget
   usb_add_gadget_udc
-  usb_add_hcd
   usb_add_phy_dev
   usb_alloc_coherent
   usb_alloc_dev
@@ -2268,7 +2267,6 @@
   usb_composite_setup_continue
   usb_control_msg
   __usb_create_hcd
-  usb_create_shared_hcd
   usb_debug_root
   usb_decode_ctrl
   usb_del_gadget_udc
@@ -2304,23 +2302,16 @@
   usb_get_maximum_speed
   usb_get_urb
   usb_gstrings_attach
-  usb_hcd_check_unlink_urb
   usb_hcd_end_port_resume
-  usb_hcd_giveback_urb
   usb_hc_died
   usb_hcd_irq
-  usb_hcd_is_primary_hcd
-  usb_hcd_link_urb_to_ep
   usb_hcd_map_urb_for_dma
   usb_hcd_pci_pm_ops
   usb_hcd_pci_probe
   usb_hcd_pci_remove
   usb_hcd_pci_shutdown
   usb_hcd_platform_shutdown
-  usb_hcd_poll_rh_status
-  usb_hcd_resume_root_hub
   usb_hcd_start_port_resume
-  usb_hcd_unlink_urb_from_ep
   usb_hub_clear_tt_buffer
   usb_hub_find_child
   usb_ifnum_to_if
@@ -2328,12 +2319,9 @@
   usb_interface_id
   usb_kill_urb
   usb_poison_urb
-  usb_put_dev
   usb_put_function_instance
-  usb_put_hcd
   usb_register_driver
   usb_register_notify
-  usb_remove_hcd
   usb_remove_phy
   usb_role_switch_get_drvdata
   usb_role_switch_register
diff --git a/android/abi_gki_aarch64_virtual_device b/android/abi_gki_aarch64_virtual_device
index 6e692dfbfa63..54df446a148e 100644
--- a/android/abi_gki_aarch64_virtual_device
+++ b/android/abi_gki_aarch64_virtual_device
@@ -393,34 +393,6 @@
   cpufreq_register_driver
   cpufreq_unregister_driver
 
-# required by dummy_hcd.ko
-  device_create_file
-  device_remove_file
-  platform_device_add_data
-  sg_miter_next
-  sg_miter_start
-  sg_miter_stop
-  usb_add_gadget_udc
-  usb_add_hcd
-  usb_create_hcd
-  usb_create_shared_hcd
-  usb_del_gadget_udc
-  usb_disabled
-  usb_ep_set_maxpacket_limit
-  usb_gadget_giveback_request
-  usb_gadget_udc_reset
-  usb_get_dev
-  usb_hcd_check_unlink_urb
-  usb_hcd_giveback_urb
-  usb_hcd_is_primary_hcd
-  usb_hcd_link_urb_to_ep
-  usb_hcd_poll_rh_status
-  usb_hcd_resume_root_hub
-  usb_hcd_unlink_urb_from_ep
-  usb_put_dev
-  usb_put_hcd
-  usb_remove_hcd
-
 # required by failover.ko
   netdev_master_upper_dev_link
   rtnl_is_locked
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 20a1bd0caf8b..980672bcfeda 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -425,6 +425,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_DUMMY_HCD=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_SERIAL=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 39e03a1c578e..fb9b757f1bfa 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -381,6 +381,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_DUMMY_HCD=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_SERIAL=y