diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 8759582438c9..ea783905526b 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -6048,6 +6048,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x13c36ed4
 }
+pointer_reference {
+  id: 0x0e61e3bf
+  kind: POINTER
+  pointee_type_id: 0x13c76860
+}
 pointer_reference {
   id: 0x0e627592
   kind: POINTER
@@ -8943,6 +8948,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x7ebccaf7
 }
+pointer_reference {
+  id: 0x1549bcfb
+  kind: POINTER
+  pointee_type_id: 0x7f661570
+}
 pointer_reference {
   id: 0x154aa8e2
   kind: POINTER
@@ -17018,6 +17028,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9edc3d1c
 }
+pointer_reference {
+  id: 0x2d27cf10
+  kind: POINTER
+  pointee_type_id: 0x9edfdadc
+}
 pointer_reference {
   id: 0x2d28e8bc
   kind: POINTER
@@ -18618,6 +18633,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9d1fcda3
 }
+pointer_reference {
+  id: 0x2dd7d891
+  kind: POINTER
+  pointee_type_id: 0x9d1f84da
+}
 pointer_reference {
   id: 0x2dd8ba7a
   kind: POINTER
@@ -25368,6 +25388,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfdf9d6ed
 }
+pointer_reference {
+  id: 0x35eee11a
+  kind: POINTER
+  pointee_type_id: 0xfdfb62f7
+}
 pointer_reference {
   id: 0x35ef2eea
   kind: POINTER
@@ -75778,6 +75803,12 @@ member {
   type_id: 0x06433852
   offset: 192
 }
+member {
+  id: 0xf9546acb
+  name: "dev_groups"
+  type_id: 0x06433852
+  offset: 384
+}
 member {
   id: 0xf9546bf2
   name: "dev_groups"
@@ -78204,6 +78235,12 @@ member {
   type_id: 0x0e996219
   offset: 512
 }
+member {
+  id: 0x8da5d9e5
+  name: "disconnect"
+  type_id: 0x0e61e3bf
+  offset: 192
+}
 member {
   id: 0x8da69b4b
   name: "disconnect"
@@ -80806,6 +80843,12 @@ member {
   type_id: 0x3c6b8341
   offset: 896
 }
+member {
+  id: 0x51e20c8a
+  name: "drvwrap"
+  type_id: 0x3c6b8341
+  offset: 448
+}
 member {
   id: 0xb5b01443
   name: "dsa"
@@ -96408,6 +96451,13 @@ member {
   type_id: 0x6d7f5ff6
   offset: 3104
 }
+member {
+  id: 0x1aea9f33
+  name: "generic_subclass"
+  type_id: 0x4585663f
+  offset: 1985
+  bitsize: 1
+}
 member {
   id: 0x4a8a7a23
   name: "genfs"
@@ -105757,6 +105807,12 @@ member {
   type_id: 0x39947122
   offset: 1792
 }
+member {
+  id: 0xc4fbc2aa
+  name: "id_table"
+  type_id: 0x38040a6c
+  offset: 1920
+}
 member {
   id: 0xc4fbc795
   name: "id_table"
@@ -123768,6 +123824,12 @@ member {
   type_id: 0x358a1c52
   offset: 320
 }
+member {
+  id: 0xe616e079
+  name: "match"
+  type_id: 0x35eee11a
+  offset: 64
+}
 member {
   id: 0xe6179934
   name: "match"
@@ -155843,6 +155905,12 @@ member {
   type_id: 0x2d196253
   offset: 384
 }
+member {
+  id: 0xd77b2d3a
+  name: "probe"
+  type_id: 0x2d27cf10
+  offset: 128
+}
 member {
   id: 0xd77b67e3
   name: "probe"
@@ -167986,6 +168054,12 @@ member {
   type_id: 0x2de9e33f
   offset: 1280
 }
+member {
+  id: 0xcab23073
+  name: "resume"
+  type_id: 0x2dd7d891
+  offset: 320
+}
 member {
   id: 0xcab23d11
   name: "resume"
@@ -188058,6 +188132,13 @@ member {
   type_id: 0x295c7202
   offset: 40
 }
+member {
+  id: 0x26cce749
+  name: "supports_autosuspend"
+  type_id: 0x4585663f
+  offset: 1984
+  bitsize: 1
+}
 member {
   id: 0x26cce85e
   name: "supports_autosuspend"
@@ -188217,6 +188298,12 @@ member {
   type_id: 0x2c1e7e89
   offset: 384
 }
+member {
+  id: 0xf397014a
+  name: "suspend"
+  type_id: 0x2dd7d891
+  offset: 256
+}
 member {
   id: 0xf39706bf
   name: "suspend"
@@ -266842,6 +266929,25 @@ struct_union {
     member_id: 0xd8aa6512
   }
 }
+struct_union {
+  id: 0x7f661570
+  kind: STRUCT
+  name: "usb_device_driver"
+  definition {
+    bytesize: 256
+    member_id: 0x0de57ce8
+    member_id: 0xe616e079
+    member_id: 0xd77b2d3a
+    member_id: 0x8da5d9e5
+    member_id: 0xf397014a
+    member_id: 0xcab23073
+    member_id: 0xf9546acb
+    member_id: 0x51e20c8a
+    member_id: 0xc4fbc2aa
+    member_id: 0x26cce749
+    member_id: 0x1aea9f33
+  }
+}
 struct_union {
   id: 0x59048a3d
   kind: STRUCT
@@ -296426,6 +296532,11 @@ function {
   parameter_id: 0x14fe2ad8
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x15ca3ead
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1549bcfb
+}
 function {
   id: 0x15cafbab
   return_type_id: 0x48b5725f
@@ -319353,6 +319464,12 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x15f20052
 }
+function {
+  id: 0x98fe1360
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1549bcfb
+  parameter_id: 0x0b27dc43
+}
 function {
   id: 0x98ff2dd7
   return_type_id: 0x6720d32f
@@ -327988,6 +328105,12 @@ function {
   parameter_id: 0x03ce74cd
   parameter_id: 0x1bb6a471
 }
+function {
+  id: 0x9d1f84da
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0d7ce7cc
+  parameter_id: 0xf017819f
+}
 function {
   id: 0x9d1fcda3
   return_type_id: 0x6720d32f
@@ -337391,6 +337514,11 @@ function {
   parameter_id: 0x0ca27481
   parameter_id: 0x1d44326e
 }
+function {
+  id: 0xfdfb62f7
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x0d7ce7cc
+}
 function {
   id: 0xfe11706f
   return_type_id: 0x4a500dc8
@@ -402261,6 +402389,15 @@ elf_symbol {
   type_id: 0x18159e1c
   full_name: "usb_deregister_dev"
 }
+elf_symbol {
+  id: 0x3be9765e
+  name: "usb_deregister_device_driver"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdadf653f
+  type_id: 0x15ca3ead
+  full_name: "usb_deregister_device_driver"
+}
 elf_symbol {
   id: 0xd75ad246
   name: "usb_device_match_id"
@@ -403143,6 +403280,15 @@ elf_symbol {
   type_id: 0x950d2ca0
   full_name: "usb_register_dev"
 }
+elf_symbol {
+  id: 0xcbba001f
+  name: "usb_register_device_driver"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb4a30ad8
+  type_id: 0x98fe1360
+  full_name: "usb_register_device_driver"
+}
 elf_symbol {
   id: 0x944deaea
   name: "usb_register_driver"
@@ -415402,6 +415548,7 @@ interface {
   symbol_id: 0x109adee2
   symbol_id: 0x784d1cb4
   symbol_id: 0x201afca9
+  symbol_id: 0x3be9765e
   symbol_id: 0xd75ad246
   symbol_id: 0xdefa9d60
   symbol_id: 0x905187d4
@@ -415500,6 +415647,7 @@ interface {
   symbol_id: 0xa834737e
   symbol_id: 0x869e15d7
   symbol_id: 0xa60cf3b7
+  symbol_id: 0xcbba001f
   symbol_id: 0x944deaea
   symbol_id: 0x413dc89c
   symbol_id: 0xbc035d91
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index aef840a271ba..ba3c1dfb35ff 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -3816,6 +3816,7 @@
   usb_debug_root
   usb_decode_ctrl
   usb_deregister
+  usb_deregister_device_driver
   usb_device_match_id
   usb_disabled
   usb_driver_claim_interface
@@ -3851,6 +3852,7 @@
   usb_put_dev
   usb_put_function_instance
   usb_put_intf
+  usb_register_device_driver
   usb_register_driver
   usb_register_notify
   usb_remove_phy