diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 567b86ef8b82..7737c9d03ec4 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -3010,6 +3010,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1a5de19e
 }
+pointer_reference {
+  id: 0x0c080ab3
+  kind: POINTER
+  pointee_type_id: 0x1a60cc51
+}
 pointer_reference {
   id: 0x0c08e6c9
   kind: POINTER
@@ -5170,6 +5175,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1d5cf24d
 }
+pointer_reference {
+  id: 0x0dc9e98b
+  kind: POINTER
+  pointee_type_id: 0x1d6740b1
+}
 pointer_reference {
   id: 0x0dcbeae6
   kind: POINTER
@@ -5345,6 +5355,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1dad5a2a
 }
+pointer_reference {
+  id: 0x0dfd7a00
+  kind: POINTER
+  pointee_type_id: 0x1db50e9d
+}
 pointer_reference {
   id: 0x0dfe95f2
   kind: POINTER
@@ -5715,6 +5730,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x136d0952
 }
+pointer_reference {
+  id: 0x0e4bb5c4
+  kind: POINTER
+  pointee_type_id: 0x136e318e
+}
 pointer_reference {
   id: 0x0e4d1ea4
   kind: POINTER
@@ -5845,6 +5865,16 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x13e38c46
 }
+pointer_reference {
+  id: 0x0e6ab35b
+  kind: POINTER
+  pointee_type_id: 0x13ea2bf1
+}
+pointer_reference {
+  id: 0x0e6b837a
+  kind: POINTER
+  pointee_type_id: 0x13eeeb77
+}
 pointer_reference {
   id: 0x0e6ba6f7
   kind: POINTER
@@ -5885,6 +5915,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x139004c0
 }
+pointer_reference {
+  id: 0x0e747c33
+  kind: POINTER
+  pointee_type_id: 0x13911651
+}
 pointer_reference {
   id: 0x0e771961
   kind: POINTER
@@ -7715,6 +7750,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6bc04187
 }
+pointer_reference {
+  id: 0x10617c73
+  kind: POINTER
+  pointee_type_id: 0x6bc51750
+}
 pointer_reference {
   id: 0x10617cac
   kind: POINTER
@@ -8000,6 +8040,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6255e5da
 }
+pointer_reference {
+  id: 0x12191e2a
+  kind: POINTER
+  pointee_type_id: 0x62249e35
+}
 pointer_reference {
   id: 0x12209d55
   kind: POINTER
@@ -16030,6 +16075,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9e732029
 }
+pointer_reference {
+  id: 0x2d0d996b
+  kind: POINTER
+  pointee_type_id: 0x9e768332
+}
 pointer_reference {
   id: 0x2d0e5e97
   kind: POINTER
@@ -16290,6 +16340,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9ee7e85b
 }
+pointer_reference {
+  id: 0x2d29d09d
+  kind: POINTER
+  pointee_type_id: 0x9ee7a4e9
+}
 pointer_reference {
   id: 0x2d2b09a5
   kind: POINTER
@@ -16330,6 +16385,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9ef2dc18
 }
+pointer_reference {
+  id: 0x2d2c9ff4
+  kind: POINTER
+  pointee_type_id: 0x9ef2994d
+}
 pointer_reference {
   id: 0x2d2d19a5
   kind: POINTER
@@ -16550,6 +16610,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9f6ce750
 }
+pointer_reference {
+  id: 0x2d4bbf27
+  kind: POINTER
+  pointee_type_id: 0x9f6e1a01
+}
 pointer_reference {
   id: 0x2d4be55c
   kind: POINTER
@@ -22290,6 +22355,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xed759acf
 }
+pointer_reference {
+  id: 0x31d242e7
+  kind: POINTER
+  pointee_type_id: 0xed09ed00
+}
 pointer_reference {
   id: 0x31d250f7
   kind: POINTER
@@ -24105,6 +24175,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfdc42b0e
 }
+pointer_reference {
+  id: 0x35e1bdb7
+  kind: POINTER
+  pointee_type_id: 0xfdc61042
+}
 pointer_reference {
   id: 0x35e65d22
   kind: POINTER
@@ -32170,6 +32245,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xc3a94ecd
 }
+qualified {
+  id: 0xed09ed00
+  qualifier: CONST
+  qualified_type_id: 0xc460028a
+}
 qualified {
   id: 0xed32e285
   qualifier: CONST
@@ -42766,6 +42846,18 @@ member {
   name: "advertising"
   type_id: 0x607419c2
 }
+member {
+  id: 0x9f16e345
+  name: "advertising"
+  type_id: 0x6720d32f
+  offset: 32
+}
+member {
+  id: 0x9f97e4f3
+  name: "advertising"
+  type_id: 0xe62ebf07
+  offset: 64
+}
 member {
   id: 0x6e09a33f
   name: "advertising_old_state"
@@ -46669,6 +46761,12 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
+member {
+  id: 0xbed54502
+  name: "autoneg"
+  type_id: 0xb3e7bac9
+  offset: 144
+}
 member {
   id: 0xbed548e9
   name: "autoneg"
@@ -49004,6 +49102,12 @@ member {
   type_id: 0xc8b17aa7
   offset: 2112
 }
+member {
+  id: 0x5e2b8001
+  name: "bh"
+  type_id: 0xa5960bec
+  offset: 4160
+}
 member {
   id: 0x5e2b8380
   name: "bh"
@@ -49252,6 +49356,12 @@ member {
   type_id: 0x2d3f9ded
   offset: 576
 }
+member {
+  id: 0x6d132c4c
+  name: "bind"
+  type_id: 0x2d0d996b
+  offset: 128
+}
 member {
   id: 0x6d137dd8
   name: "bind"
@@ -53821,6 +53931,13 @@ member {
   offset: 7272
   bitsize: 1
 }
+member {
+  id: 0x372f61a0
+  name: "can_dma_sg"
+  type_id: 0x4585663f
+  offset: 832
+  bitsize: 1
+}
 member {
   id: 0xdf02d971
   name: "can_do_streams"
@@ -56252,6 +56369,12 @@ member {
   type_id: 0x2fa652dc
   offset: 896
 }
+member {
+  id: 0x2afab2be
+  name: "check_connect"
+  type_id: 0x2d2c9ff4
+  offset: 384
+}
 member {
   id: 0x9a06e741
   name: "check_cq"
@@ -65972,6 +66095,12 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
+member {
+  id: 0xff770ca3
+  name: "data"
+  type_id: 0xe5217790
+  offset: 1600
+}
 member {
   id: 0xff7ae59e
   name: "data"
@@ -66180,6 +66309,12 @@ member {
   type_id: 0x33756485
   offset: 256
 }
+member {
+  id: 0xffa15c7e
+  name: "data"
+  type_id: 0x33756485
+  offset: 1088
+}
 member {
   id: 0xffa58914
   name: "data"
@@ -68061,6 +68196,12 @@ member {
   type_id: 0x33756485
   offset: 1280
 }
+member {
+  id: 0xf04d78e0
+  name: "deferred"
+  type_id: 0xfb1df068
+  offset: 3712
+}
 member {
   id: 0xf065af4e
   name: "deferred"
@@ -68360,6 +68501,12 @@ member {
   type_id: 0xe8034002
   offset: 16
 }
+member {
+  id: 0x84e83055
+  name: "delay"
+  type_id: 0xd298e888
+  offset: 1088
+}
 member {
   id: 0x84f3a492
   name: "delay"
@@ -69099,6 +69246,11 @@ member {
   type_id: 0x0483e6f8
   offset: 64
 }
+member {
+  id: 0x317e664b
+  name: "description"
+  type_id: 0x0483e6f8
+}
 member {
   id: 0x317e66e0
   name: "description"
@@ -69741,6 +69893,12 @@ member {
   type_id: 0x32a623d7
   offset: 2880
 }
+member {
+  id: 0xce0b4ca0
+  name: "dev"
+  type_id: 0x32a623d7
+  offset: 192
+}
 member {
   id: 0xce0b4dab
   name: "dev"
@@ -73774,6 +73932,12 @@ member {
   name: "done"
   type_id: 0x4585663f
 }
+member {
+  id: 0x1d18f3a0
+  name: "done"
+  type_id: 0x578f9c2b
+  offset: 2944
+}
 member {
   id: 0x1d220120
   name: "done"
@@ -74817,6 +74981,12 @@ member {
   type_id: 0x42af4f5c
   offset: 1536
 }
+member {
+  id: 0x5e589542
+  name: "driver_info"
+  type_id: 0x31d242e7
+  offset: 128
+}
 member {
   id: 0x3f6b14f0
   name: "driver_input_lock"
@@ -74919,6 +75089,12 @@ member {
   type_id: 0x18bd6530
   offset: 448
 }
+member {
+  id: 0xe49f6571
+  name: "driver_priv"
+  type_id: 0x18bd6530
+  offset: 256
+}
 member {
   id: 0xe49f68ac
   name: "driver_priv"
@@ -75929,6 +76105,12 @@ member {
   type_id: 0x74d29cf1
   offset: 7008
 }
+member {
+  id: 0x703907cc
+  name: "duplex"
+  type_id: 0xb3e7bac9
+  offset: 112
+}
 member {
   id: 0x70390fe0
   name: "duplex"
@@ -76383,6 +76565,12 @@ member {
   type_id: 0x4585663f
   offset: 192
 }
+member {
+  id: 0x61d268eb
+  name: "early_init"
+  type_id: 0x2d2c9ff4
+  offset: 832
+}
 member {
   id: 0xdaa08699
   name: "early_init"
@@ -79262,12 +79450,24 @@ member {
   type_id: 0x39470e64
   offset: 256
 }
+member {
+  id: 0xca94b2d4
+  name: "eth_tp_mdix"
+  type_id: 0xb3e7bac9
+  offset: 240
+}
 member {
   id: 0xca94b363
   name: "eth_tp_mdix"
   type_id: 0xb3e7bac9
   offset: 104
 }
+member {
+  id: 0x8530641a
+  name: "eth_tp_mdix_ctrl"
+  type_id: 0xb3e7bac9
+  offset: 248
+}
 member {
   id: 0x8530689b
   name: "eth_tp_mdix_ctrl"
@@ -85152,6 +85352,12 @@ member {
   type_id: 0x33756485
   offset: 64
 }
+member {
+  id: 0x2d5bf612
+  name: "flags"
+  type_id: 0x33756485
+  offset: 4736
+}
 member {
   id: 0x2d5bf625
   name: "flags"
@@ -86887,6 +87093,13 @@ member {
   type_id: 0x6d7f5ff6
   offset: 392
 }
+member {
+  id: 0x5c082ca7
+  name: "force_media"
+  type_id: 0x4585663f
+  offset: 129
+  bitsize: 1
+}
 member {
   id: 0x4f817797
   name: "force_mld_version"
@@ -88827,6 +89040,13 @@ member {
   name: "full64"
   type_id: 0x92233392
 }
+member {
+  id: 0x9034a01c
+  name: "full_duplex"
+  type_id: 0x4585663f
+  offset: 128
+  bitsize: 1
+}
 member {
   id: 0x9c1851f6
   name: "full_fds_bits"
@@ -93345,6 +93565,12 @@ member {
   type_id: 0xc93e017b
   offset: 1776
 }
+member {
+  id: 0xb7653415
+  name: "hard_mtu"
+  type_id: 0xc9082b19
+  offset: 1952
+}
 member {
   id: 0x195dbd54
   name: "hard_packet_limit"
@@ -100194,6 +100420,18 @@ member {
   name: "in"
   type_id: 0x18bd6530
 }
+member {
+  id: 0x5ccc4e6f
+  name: "in"
+  type_id: 0x6720d32f
+  offset: 1024
+}
+member {
+  id: 0x5ceeea08
+  name: "in"
+  type_id: 0x4585663f
+  offset: 864
+}
 member {
   id: 0x5ceeecc5
   name: "in"
@@ -100820,6 +101058,12 @@ member {
   offset: 1153
   bitsize: 1
 }
+member {
+  id: 0x9f5f61bb
+  name: "indication"
+  type_id: 0x0e747c33
+  offset: 896
+}
 member {
   id: 0x3d384dd8
   name: "indio_dev"
@@ -102684,12 +102928,24 @@ member {
   type_id: 0x18ea6ae3
   offset: 448
 }
+member {
+  id: 0xdd499b5c
+  name: "interrupt"
+  type_id: 0x0130219f
+  offset: 3328
+}
 member {
   id: 0xdd4afb18
   name: "interrupt"
   type_id: 0x02578e46
   offset: 256
 }
+member {
+  id: 0x72db064a
+  name: "interrupt_count"
+  type_id: 0x4585663f
+  offset: 3392
+}
 member {
   id: 0xd6a7ee2b
   name: "interrupt_enable"
@@ -102720,6 +102976,12 @@ member {
   type_id: 0x0130219f
   offset: 3264
 }
+member {
+  id: 0x19761d86
+  name: "interrupt_mutex"
+  type_id: 0xa7c362b0
+  offset: 3456
+}
 member {
   id: 0x88026c22
   name: "interrupt_out"
@@ -102885,6 +103147,12 @@ member {
   type_id: 0xada50e68
   offset: 2080
 }
+member {
+  id: 0x8a1b2331
+  name: "intf"
+  type_id: 0x21069feb
+  offset: 64
+}
 member {
   id: 0x8a1d1999
   name: "intf"
@@ -106907,6 +107175,12 @@ member {
   type_id: 0x28b9ec9a
   offset: 768
 }
+member {
+  id: 0x7de43795
+  name: "kevent"
+  type_id: 0x1f3c8679
+  offset: 4480
+}
 member {
   id: 0x20068778
   name: "key"
@@ -111360,6 +111634,12 @@ member {
   name: "link_rate"
   type_id: 0x4585663f
 }
+member {
+  id: 0x027dc99d
+  name: "link_reset"
+  type_id: 0x2d2c9ff4
+  offset: 576
+}
 member {
   id: 0x8a9ef2e8
   name: "link_setup"
@@ -113942,6 +114222,12 @@ member {
   type_id: 0xe62ebf07
   offset: 96
 }
+member {
+  id: 0x6279847e
+  name: "lp_advertising"
+  type_id: 0xe62ebf07
+  offset: 256
+}
 member {
   id: 0x62ffd7b1
   name: "lp_advertising"
@@ -114791,6 +115077,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 776
 }
+member {
+  id: 0x42f7cb5a
+  name: "manage_power"
+  type_id: 0x2d4bbf27
+  offset: 448
+}
 member {
   id: 0x42ee5b52
   name: "manage_start_stop"
@@ -118672,6 +118964,12 @@ member {
   offset: 368
   bitsize: 16
 }
+member {
+  id: 0x63fb074d
+  name: "maxpacket"
+  type_id: 0x4585663f
+  offset: 1024
+}
 member {
   id: 0x0806dc1f
   name: "maxpacket_limit"
@@ -118697,6 +118995,18 @@ member {
   type_id: 0x33756485
   offset: 4736
 }
+member {
+  id: 0x51858165
+  name: "maxrxpkt"
+  type_id: 0xe62ebf07
+  offset: 192
+}
+member {
+  id: 0x349eb14e
+  name: "maxtxpkt"
+  type_id: 0xe62ebf07
+  offset: 160
+}
 member {
   id: 0x32c64e99
   name: "maxtype"
@@ -119238,12 +119548,30 @@ member {
   type_id: 0x50930294
   offset: 15552
 }
+member {
+  id: 0x8da29d66
+  name: "mdio_read"
+  type_id: 0x2ebb318f
+  offset: 256
+}
+member {
+  id: 0xe2b8933a
+  name: "mdio_support"
+  type_id: 0xb3e7bac9
+  offset: 152
+}
 member {
   id: 0xe2b8944e
   name: "mdio_support"
   type_id: 0xb3e7bac9
   offset: 96
 }
+member {
+  id: 0x2fb1c3e7
+  name: "mdio_write"
+  type_id: 0x0dfd7a00
+  offset: 320
+}
 member {
   id: 0x64615c20
   name: "mdiodrv"
@@ -120391,6 +120719,12 @@ member {
   type_id: 0x18bd6530
   offset: 8512
 }
+member {
+  id: 0x3ebe7e3f
+  name: "mii"
+  type_id: 0x62249e35
+  offset: 2048
+}
 member {
   id: 0xbf23be49
   name: "mii_ts"
@@ -123647,6 +123981,12 @@ member {
   type_id: 0x11f20613
   offset: 576
 }
+member {
+  id: 0x893559d9
+  name: "msg_enable"
+  type_id: 0x6720d32f
+  offset: 1536
+}
 member {
   id: 0xc31fa462
   name: "msg_flags"
@@ -126955,6 +127295,12 @@ member {
   type_id: 0x0ca27481
   offset: 704
 }
+member {
+  id: 0x723dee58
+  name: "net"
+  type_id: 0x32a623d7
+  offset: 1472
+}
 member {
   id: 0x72bc7338
   name: "net"
@@ -136203,6 +136549,12 @@ member {
   type_id: 0xff8884d8
   offset: 160
 }
+member {
+  id: 0xb396f982
+  name: "out"
+  type_id: 0x6720d32f
+  offset: 1056
+}
 member {
   id: 0xb39ca275
   name: "out"
@@ -136215,6 +136567,12 @@ member {
   type_id: 0x4585663f
   offset: 32
 }
+member {
+  id: 0xb3b45fb0
+  name: "out"
+  type_id: 0x4585663f
+  offset: 896
+}
 member {
   id: 0xb3c37f91
   name: "out"
@@ -137697,6 +138055,12 @@ member {
   name: "padding2"
   type_id: 0x23cbe491
 }
+member {
+  id: 0xbedde87d
+  name: "padding_pkt"
+  type_id: 0x3e10b518
+  offset: 1408
+}
 member {
   id: 0xab0027ec
   name: "pads"
@@ -141346,6 +141710,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 64
 }
+member {
+  id: 0xcc9165e4
+  name: "phy_address"
+  type_id: 0xb3e7bac9
+  offset: 128
+}
 member {
   id: 0xcc9168ba
   name: "phy_address"
@@ -141364,6 +141734,11 @@ member {
   type_id: 0xc2aafbc8
   offset: 48
 }
+member {
+  id: 0xad6edd33
+  name: "phy_id"
+  type_id: 0x6720d32f
+}
 member {
   id: 0xadc0f146
   name: "phy_id"
@@ -141376,12 +141751,23 @@ member {
   type_id: 0xc9082b19
   offset: 1216
 }
+member {
+  id: 0xade1fea0
+  name: "phy_id"
+  type_id: 0xe8034002
+}
 member {
   id: 0xd64be02a
   name: "phy_id_mask"
   type_id: 0xc9082b19
   offset: 1344
 }
+member {
+  id: 0xd6e5c6b0
+  name: "phy_id_mask"
+  type_id: 0x6720d32f
+  offset: 64
+}
 member {
   id: 0x6ffc75b9
   name: "phy_ignore_ta_mask"
@@ -141406,6 +141792,12 @@ member {
   type_id: 0xc9082b19
   offset: 17600
 }
+member {
+  id: 0x1173939d
+  name: "phy_mutex"
+  type_id: 0xa7c362b0
+  offset: 512
+}
 member {
   id: 0xba419a21
   name: "phy_roothub"
@@ -142412,12 +142804,24 @@ member {
   type_id: 0x6d7f5ff6
   offset: 72
 }
+member {
+  id: 0x16197475
+  name: "pkt_cnt"
+  type_id: 0x5d8155a5
+  offset: 776
+}
 member {
   id: 0x16d5bfbc
   name: "pkt_cnt"
   type_id: 0x914dbfdc
   offset: 7968
 }
+member {
+  id: 0xe5316bda
+  name: "pkt_err"
+  type_id: 0x5d8155a5
+  offset: 784
+}
 member {
   id: 0xfdc3930a
   name: "pkt_in"
@@ -143905,6 +144309,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 72
 }
+member {
+  id: 0x4848fa31
+  name: "port"
+  type_id: 0xb3e7bac9
+  offset: 120
+}
 member {
   id: 0x488e9071
   name: "port"
@@ -153360,6 +153770,12 @@ member {
   type_id: 0x74d29cf1
   offset: 32
 }
+member {
+  id: 0x8a6b6b4e
+  name: "recover"
+  type_id: 0x0e6ab35b
+  offset: 768
+}
 member {
   id: 0x26de94f4
   name: "recover_bus"
@@ -154441,6 +154857,18 @@ member {
   type_id: 0x0fb82403
   offset: 2880
 }
+member {
+  id: 0x5b0ec69f
+  name: "reg_num"
+  type_id: 0xe8034002
+  offset: 16
+}
+member {
+  id: 0x386b59a8
+  name: "reg_num_mask"
+  type_id: 0x6720d32f
+  offset: 96
+}
 member {
   id: 0x83dea94b
   name: "reg_offset"
@@ -157770,6 +158198,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 216
 }
+member {
+  id: 0x6290827d
+  name: "reset"
+  type_id: 0x2d2c9ff4
+  offset: 256
+}
 member {
   id: 0x62908bb1
   name: "reset"
@@ -161706,6 +162140,12 @@ member {
   type_id: 0x3f8df16a
   offset: 640
 }
+member {
+  id: 0x92de6fb0
+  name: "rx_fixup"
+  type_id: 0x2d29d09d
+  offset: 640
+}
 member {
   id: 0x0b2cd35d
   name: "rx_flags"
@@ -162069,6 +162509,12 @@ member {
   type_id: 0x578f9c2b
   offset: 21184
 }
+member {
+  id: 0x671dccaa
+  name: "rx_qlen"
+  type_id: 0xc93e017b
+  offset: 800
+}
 member {
   id: 0x035944d3
   name: "rx_rate"
@@ -162162,6 +162608,12 @@ member {
   type_id: 0x0baa70a7
   offset: 352
 }
+member {
+  id: 0x0b6796b8
+  name: "rx_speed"
+  type_id: 0xfc0e1dbd
+  offset: 2432
+}
 member {
   id: 0x15ec0295
   name: "rx_start_bit_low_too_short_cnt"
@@ -162274,6 +162726,12 @@ member {
   type_id: 0x295c7202
   offset: 8
 }
+member {
+  id: 0x41517cd5
+  name: "rx_urb_size"
+  type_id: 0xf435685e
+  offset: 1984
+}
 member {
   id: 0x6e7f7cf1
   name: "rx_work"
@@ -162286,12 +162744,24 @@ member {
   type_id: 0xe8034002
   offset: 16
 }
+member {
+  id: 0x94aef420
+  name: "rxq"
+  type_id: 0x578f9c2b
+  offset: 2560
+}
 member {
   id: 0x94d9a882
   name: "rxq"
   type_id: 0x20d23755
   offset: 256
 }
+member {
+  id: 0x6e10ac71
+  name: "rxq_pause"
+  type_id: 0x578f9c2b
+  offset: 3136
+}
 member {
   id: 0x2de5fdee
   name: "rxrate"
@@ -167713,6 +168183,12 @@ member {
   type_id: 0x2f93ebdc
   offset: 2048
 }
+member {
+  id: 0x098f8c42
+  name: "set_rx_mode"
+  type_id: 0x0e6ab35b
+  offset: 960
+}
 member {
   id: 0x142af9ef
   name: "set_rxfh"
@@ -172716,6 +173192,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 704
 }
+member {
+  id: 0xa002871a
+  name: "speed"
+  type_id: 0xe8034002
+  offset: 96
+}
 member {
   id: 0xa00cae5d
   name: "speed"
@@ -172769,6 +173251,12 @@ member {
   name: "speed"
   type_id: 0x0faae5b1
 }
+member {
+  id: 0x93cedaae
+  name: "speed_hi"
+  type_id: 0xe8034002
+  offset: 224
+}
 member {
   id: 0x5ba71926
   name: "speed_hz"
@@ -176151,6 +176639,12 @@ member {
   type_id: 0x067c4b9a
   offset: 896
 }
+member {
+  id: 0x2064b69b
+  name: "status"
+  type_id: 0x0399ec3e
+  offset: 960
+}
 member {
   id: 0x2065db16
   name: "status"
@@ -176161,6 +176655,12 @@ member {
   name: "status"
   type_id: 0x0faae5b1
 }
+member {
+  id: 0x2069471f
+  name: "status"
+  type_id: 0x0e6b837a
+  offset: 512
+}
 member {
   id: 0x206a163d
   name: "status"
@@ -176632,6 +177132,12 @@ member {
   type_id: 0x2c8534d8
   offset: 576
 }
+member {
+  id: 0x69a55104
+  name: "stop"
+  type_id: 0x2d2c9ff4
+  offset: 320
+}
 member {
   id: 0x69a5ab33
   name: "stop"
@@ -178167,6 +178673,13 @@ member {
   type_id: 0x352b5569
   offset: 384
 }
+member {
+  id: 0xa91c3239
+  name: "supports_gmii"
+  type_id: 0x4585663f
+  offset: 130
+  bitsize: 1
+}
 member {
   id: 0x2138b2e5
   name: "supports_op"
@@ -178403,6 +178916,12 @@ member {
   offset: 33
   bitsize: 1
 }
+member {
+  id: 0xdccb66a4
+  name: "suspend_count"
+  type_id: 0x5d8155a5
+  offset: 768
+}
 member {
   id: 0xdcd36a92
   name: "suspend_count"
@@ -184942,6 +185461,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 128
 }
+member {
+  id: 0x555e8335
+  name: "transceiver"
+  type_id: 0xb3e7bac9
+  offset: 136
+}
 member {
   id: 0x625eae55
   name: "transfer"
@@ -186968,6 +187493,12 @@ member {
   type_id: 0x3f8df16a
   offset: 704
 }
+member {
+  id: 0xbcd1df4e
+  name: "tx_fixup"
+  type_id: 0x10617c73
+  offset: 704
+}
 member {
   id: 0x13091341
   name: "tx_frames"
@@ -187376,6 +187907,12 @@ member {
   type_id: 0x578f9c2b
   offset: 5056
 }
+member {
+  id: 0x327a577c
+  name: "tx_qlen"
+  type_id: 0xc93e017b
+  offset: 816
+}
 member {
   id: 0x580681a6
   name: "tx_queue_len"
@@ -187494,6 +188031,12 @@ member {
   type_id: 0x0baa70a7
   offset: 320
 }
+member {
+  id: 0x71b83776
+  name: "tx_speed"
+  type_id: 0xfc0e1dbd
+  offset: 2496
+}
 member {
   id: 0x4a0d7a83
   name: "tx_state"
@@ -187725,6 +188268,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 672
 }
+member {
+  id: 0x420ec74c
+  name: "txq"
+  type_id: 0x578f9c2b
+  offset: 2752
+}
 member {
   id: 0x4274cbf0
   name: "txq"
@@ -189509,6 +190058,11 @@ member {
   type_id: 0x2fa652dc
   offset: 576
 }
+member {
+  id: 0xbb0eb3a5
+  name: "udev"
+  type_id: 0x0d7ce7cc
+}
 member {
   id: 0xbb0eb744
   name: "udev"
@@ -189946,6 +190500,12 @@ member {
   type_id: 0x0e59d199
   offset: 192
 }
+member {
+  id: 0x5994b26d
+  name: "unbind"
+  type_id: 0x0e4bb5c4
+  offset: 192
+}
 member {
   id: 0x5994ea90
   name: "unbind"
@@ -193077,6 +193637,18 @@ member {
   type_id: 0xbbd6353d
   offset: 832
 }
+member {
+  id: 0xdf4f7b1b
+  name: "val_in"
+  type_id: 0xe8034002
+  offset: 32
+}
+member {
+  id: 0xc7438034
+  name: "val_out"
+  type_id: 0xe8034002
+  offset: 48
+}
 member {
   id: 0xe2ab09c2
   name: "valid"
@@ -199929,6 +200501,12 @@ member {
   type_id: 0x1285100d
   offset: 512
 }
+member {
+  id: 0x4ddbf211
+  name: "xid"
+  type_id: 0xc9082b19
+  offset: 1920
+}
 member {
   id: 0x3025ab5e
   name: "xlate"
@@ -217516,6 +218094,33 @@ struct_union {
   kind: STRUCT
   name: "driver_data"
 }
+struct_union {
+  id: 0xc460028a
+  kind: STRUCT
+  name: "driver_info"
+  definition {
+    bytesize: 144
+    member_id: 0x317e664b
+    member_id: 0x2d0fa06c
+    member_id: 0x6d132c4c
+    member_id: 0x5994b26d
+    member_id: 0x6290827d
+    member_id: 0x69a55104
+    member_id: 0x2afab2be
+    member_id: 0x42f7cb5a
+    member_id: 0x2069471f
+    member_id: 0x027dc99d
+    member_id: 0x92de6fb0
+    member_id: 0xbcd1df4e
+    member_id: 0x8a6b6b4e
+    member_id: 0x61d268eb
+    member_id: 0x9f5f61bb
+    member_id: 0x098f8c42
+    member_id: 0x5ccc4e6f
+    member_id: 0xb396f982
+    member_id: 0xffa15c7e
+  }
+}
 struct_union {
   id: 0x3812b02e
   kind: STRUCT
@@ -220013,6 +220618,31 @@ struct_union {
     member_id: 0x26f5c78d
   }
 }
+struct_union {
+  id: 0x1a60cc51
+  kind: STRUCT
+  name: "ethtool_cmd"
+  definition {
+    bytesize: 44
+    member_id: 0x1af6f030
+    member_id: 0x878d4469
+    member_id: 0x9f97e4f3
+    member_id: 0xa002871a
+    member_id: 0x703907cc
+    member_id: 0x4848fa31
+    member_id: 0xcc9165e4
+    member_id: 0x555e8335
+    member_id: 0xbed54502
+    member_id: 0xe2b8933a
+    member_id: 0x349eb14e
+    member_id: 0x51858165
+    member_id: 0x93cedaae
+    member_id: 0xca94b2d4
+    member_id: 0x8530641a
+    member_id: 0x6279847e
+    member_id: 0xd4368a4c
+  }
+}
 struct_union {
   id: 0xe87b6f2e
   kind: STRUCT
@@ -233609,6 +234239,36 @@ struct_union {
     member_id: 0x3bc10349
   }
 }
+struct_union {
+  id: 0x62249e35
+  kind: STRUCT
+  name: "mii_if_info"
+  definition {
+    bytesize: 48
+    member_id: 0xad6edd33
+    member_id: 0x9f16e345
+    member_id: 0xd6e5c6b0
+    member_id: 0x386b59a8
+    member_id: 0x9034a01c
+    member_id: 0x5c082ca7
+    member_id: 0xa91c3239
+    member_id: 0xce0b4ca0
+    member_id: 0x8da29d66
+    member_id: 0x2fb1c3e7
+  }
+}
+struct_union {
+  id: 0xfdc61042
+  kind: STRUCT
+  name: "mii_ioctl_data"
+  definition {
+    bytesize: 8
+    member_id: 0xade1fea0
+    member_id: 0x5b0ec69f
+    member_id: 0xdf4f7b1b
+    member_id: 0xc7438034
+  }
+}
 struct_union {
   id: 0x0e1ea6e1
   kind: STRUCT
@@ -254637,6 +255297,53 @@ struct_union {
     member_id: 0x4b47d40c
   }
 }
+struct_union {
+  id: 0x1d6740b1
+  kind: STRUCT
+  name: "usbnet"
+  definition {
+    bytesize: 600
+    member_id: 0xbb0eb3a5
+    member_id: 0x8a1b2331
+    member_id: 0x5e589542
+    member_id: 0xf415f74d
+    member_id: 0xe49f6571
+    member_id: 0x202d9055
+    member_id: 0x1173939d
+    member_id: 0xdccb66a4
+    member_id: 0x16197475
+    member_id: 0xe5316bda
+    member_id: 0x671dccaa
+    member_id: 0x327a577c
+    member_id: 0x372f61a0
+    member_id: 0x5ceeea08
+    member_id: 0xb3b45fb0
+    member_id: 0x2064b69b
+    member_id: 0x63fb074d
+    member_id: 0x84e83055
+    member_id: 0xbedde87d
+    member_id: 0x723dee58
+    member_id: 0x893559d9
+    member_id: 0xff770ca3
+    member_id: 0x4ddbf211
+    member_id: 0xb7653415
+    member_id: 0x41517cd5
+    member_id: 0x3ebe7e3f
+    member_id: 0x0b6796b8
+    member_id: 0x71b83776
+    member_id: 0x94aef420
+    member_id: 0x420ec74c
+    member_id: 0x1d18f3a0
+    member_id: 0x6e10ac71
+    member_id: 0xdd499b5c
+    member_id: 0x72db064a
+    member_id: 0x19761d86
+    member_id: 0xf04d78e0
+    member_id: 0x5e2b8001
+    member_id: 0x7de43795
+    member_id: 0x2d5bf612
+  }
+}
 struct_union {
   id: 0xd19129ce
   kind: STRUCT
@@ -280816,6 +281523,13 @@ function {
   parameter_id: 0x27a7c613
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x12448959
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x12457cb4
   return_type_id: 0x48b5725f
@@ -281501,6 +282215,12 @@ function {
   parameter_id: 0x0e5eb556
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x136e318e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x21069feb
+}
 function {
   id: 0x137596b0
   return_type_id: 0x48b5725f
@@ -281590,6 +282310,13 @@ function {
   parameter_id: 0x3399c453
   parameter_id: 0x384c5795
 }
+function {
+  id: 0x13911651
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x18bd6530
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x139c8318
   return_type_id: 0x48b5725f
@@ -281769,6 +282496,17 @@ function {
   parameter_id: 0x0e6ba6f7
   parameter_id: 0x3a9fa744
 }
+function {
+  id: 0x13ea2bf1
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0dc9e98b
+}
+function {
+  id: 0x13eeeb77
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x0130219f
+}
 function {
   id: 0x13f3b20a
   return_type_id: 0x08113aaf
@@ -281948,6 +282686,12 @@ function {
   parameter_id: 0x1d19a9d5
   parameter_id: 0xfc0e1dbd
 }
+function {
+  id: 0x142e3633
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12191e2a
+  parameter_id: 0x0c080ab3
+}
 function {
   id: 0x142fe8b0
   return_type_id: 0x48b5725f
@@ -287800,6 +288544,14 @@ function {
   parameter_id: 0x026c3dea
   parameter_id: 0xc9082b19
 }
+function {
+  id: 0x1db50e9d
+  return_type_id: 0x48b5725f
+  parameter_id: 0x32a623d7
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x1db8b9d1
   return_type_id: 0x48b5725f
@@ -292863,6 +293615,13 @@ function {
   return_type_id: 0x18bd6530
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x6bc51750
+  return_type_id: 0x054f691a
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x054f691a
+  parameter_id: 0xf1a6dfed
+}
 function {
   id: 0x6c109ae9
   return_type_id: 0x249959de
@@ -302375,6 +303134,11 @@ function {
   parameter_id: 0x39c6a784
   parameter_id: 0x3505339e
 }
+function {
+  id: 0x9906a4a5
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12191e2a
+}
 function {
   id: 0x9907c5d4
   return_type_id: 0x6720d32f
@@ -303732,6 +304496,14 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x111ee6f8
 }
+function {
+  id: 0x99c885a2
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12191e2a
+  parameter_id: 0x35e1bdb7
+  parameter_id: 0x6720d32f
+  parameter_id: 0x1bf16028
+}
 function {
   id: 0x99ccb18c
   return_type_id: 0x6720d32f
@@ -310926,6 +311698,12 @@ function {
   parameter_id: 0x13689f5b
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x9e768332
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x21069feb
+}
 function {
   id: 0x9e789129
   return_type_id: 0x6720d32f
@@ -311285,6 +312063,12 @@ function {
   parameter_id: 0x0258f96e
   parameter_id: 0xfc0e1dbd
 }
+function {
+  id: 0x9ee7a4e9
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x054f691a
+}
 function {
   id: 0x9ee7e85b
   return_type_id: 0x6720d32f
@@ -311364,6 +312148,11 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9ef2994d
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0dc9e98b
+}
 function {
   id: 0x9ef2dc18
   return_type_id: 0x6720d32f
@@ -311810,6 +312599,12 @@ function {
   parameter_id: 0xc9082b19
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9f6e1a01
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0dc9e98b
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9f6f73ed
   return_type_id: 0x6720d32f
@@ -314012,6 +314807,13 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0xcb5a4db0
+  return_type_id: 0x4585663f
+  parameter_id: 0x12191e2a
+  parameter_id: 0x4585663f
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xcb7f2e4a
   return_type_id: 0x2314b69f
@@ -335664,6 +336466,15 @@ elf_symbol {
   type_id: 0x8ce1baa0
   full_name: "generic_handle_irq"
 }
+elf_symbol {
+  id: 0x95a840b8
+  name: "generic_mii_ioctl"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x01a17509
+  type_id: 0x99c885a2
+  full_name: "generic_mii_ioctl"
+}
 elf_symbol {
   id: 0x7f639ef1
   name: "generic_perform_write"
@@ -335871,6 +336682,15 @@ elf_symbol {
   type_id: 0x91dd4b0e
   full_name: "genphy_read_abilities"
 }
+elf_symbol {
+  id: 0xcaf802e6
+  name: "genphy_read_lpa"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa20c8ff5
+  type_id: 0x91dd4b0e
+  full_name: "genphy_read_lpa"
+}
 elf_symbol {
   id: 0xbaba47ed
   name: "genphy_read_mmd_unsupported"
@@ -335925,6 +336745,15 @@ elf_symbol {
   type_id: 0x91dd4b0e
   full_name: "genphy_suspend"
 }
+elf_symbol {
+  id: 0xae957b3b
+  name: "genphy_update_link"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xce9724c0
+  type_id: 0x91dd4b0e
+  full_name: "genphy_update_link"
+}
 elf_symbol {
   id: 0x77665a1c
   name: "genphy_write_mmd_unsupported"
@@ -343619,6 +344448,33 @@ elf_symbol {
   type_id: 0x9aaabb4a
   full_name: "migrate_swap"
 }
+elf_symbol {
+  id: 0x68c3a63b
+  name: "mii_check_media"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8b58ddf9
+  type_id: 0xcb5a4db0
+  full_name: "mii_check_media"
+}
+elf_symbol {
+  id: 0xbc90165b
+  name: "mii_ethtool_gset"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf00ae9d4
+  type_id: 0x142e3633
+  full_name: "mii_ethtool_gset"
+}
+elf_symbol {
+  id: 0x1579ecd2
+  name: "mii_nway_restart"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x85fcb16f
+  type_id: 0x9906a4a5
+  full_name: "mii_nway_restart"
+}
 elf_symbol {
   id: 0xe4572a81
   name: "mipi_dsi_attach"
@@ -347537,6 +348393,15 @@ elf_symbol {
   type_id: 0x90738a48
   full_name: "phy_read_mmd"
 }
+elf_symbol {
+  id: 0x8fff831c
+  name: "phy_resolve_aneg_linkmode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6219d28b
+  type_id: 0x1cc5f9b2
+  full_name: "phy_resolve_aneg_linkmode"
+}
 elf_symbol {
   id: 0x6a86851c
   name: "phy_set_mode_ext"
@@ -347546,6 +348411,15 @@ elf_symbol {
   type_id: 0x9ccae70d
   full_name: "phy_set_mode_ext"
 }
+elf_symbol {
+  id: 0x10d51eda
+  name: "phy_start_aneg"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0a68ceaa
+  type_id: 0x91dd4b0e
+  full_name: "phy_start_aneg"
+}
 elf_symbol {
   id: 0xa3314c5c
   name: "phy_trigger_machine"
@@ -359835,6 +360709,24 @@ elf_symbol {
   type_id: 0x1675f88f
   full_name: "usb_unregister_notify"
 }
+elf_symbol {
+  id: 0x52816b1c
+  name: "usbnet_get_endpoints"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc7af575d
+  type_id: 0x9e768332
+  full_name: "usbnet_get_endpoints"
+}
+elf_symbol {
+  id: 0x19d80976
+  name: "usbnet_link_change"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x71d429b8
+  type_id: 0x12448959
+  full_name: "usbnet_link_change"
+}
 elf_symbol {
   id: 0xb5437ef4
   name: "usleep_range_state"
@@ -371537,6 +372429,10 @@ symbols {
     key: "generic_handle_irq"
     value: 0x7d577f86
   }
+  symbol {
+    key: "generic_mii_ioctl"
+    value: 0x95a840b8
+  }
   symbol {
     key: "generic_perform_write"
     value: 0x7f639ef1
@@ -371629,6 +372525,10 @@ symbols {
     key: "genphy_read_abilities"
     value: 0xe00705b3
   }
+  symbol {
+    key: "genphy_read_lpa"
+    value: 0xcaf802e6
+  }
   symbol {
     key: "genphy_read_mmd_unsupported"
     value: 0xbaba47ed
@@ -371653,6 +372553,10 @@ symbols {
     key: "genphy_suspend"
     value: 0xfc12228c
   }
+  symbol {
+    key: "genphy_update_link"
+    value: 0xae957b3b
+  }
   symbol {
     key: "genphy_write_mmd_unsupported"
     value: 0x77665a1c
@@ -375073,6 +375977,18 @@ symbols {
     key: "migrate_swap"
     value: 0xbad16ab3
   }
+  symbol {
+    key: "mii_check_media"
+    value: 0x68c3a63b
+  }
+  symbol {
+    key: "mii_ethtool_gset"
+    value: 0xbc90165b
+  }
+  symbol {
+    key: "mii_nway_restart"
+    value: 0x1579ecd2
+  }
   symbol {
     key: "mipi_dsi_attach"
     value: 0xe4572a81
@@ -376813,10 +377729,18 @@ symbols {
     key: "phy_read_mmd"
     value: 0x1a84af17
   }
+  symbol {
+    key: "phy_resolve_aneg_linkmode"
+    value: 0x8fff831c
+  }
   symbol {
     key: "phy_set_mode_ext"
     value: 0x6a86851c
   }
+  symbol {
+    key: "phy_start_aneg"
+    value: 0x10d51eda
+  }
   symbol {
     key: "phy_trigger_machine"
     value: 0xa3314c5c
@@ -382281,6 +383205,14 @@ symbols {
     key: "usb_unregister_notify"
     value: 0xcac8f190
   }
+  symbol {
+    key: "usbnet_get_endpoints"
+    value: 0x52816b1c
+  }
+  symbol {
+    key: "usbnet_link_change"
+    value: 0x19d80976
+  }
   symbol {
     key: "usleep_range_state"
     value: 0xb5437ef4
diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy
index 2d36aad460f4..972b1a3b9f48 100644
--- a/android/abi_gki_aarch64_galaxy
+++ b/android/abi_gki_aarch64_galaxy
@@ -67,8 +67,11 @@
   free_pages
   free_pages_exact
   generic_file_read_iter
+  generic_mii_ioctl
   generic_perform_write
   generic_write_checks
+  genphy_read_lpa
+  genphy_update_link
   gen_pool_add_owner
   gen_pool_alloc_algo_owner
   gen_pool_destroy
@@ -132,6 +135,9 @@
   memset
   __memset_io
   memstart_addr
+  mii_check_media
+  mii_ethtool_gset
+  mii_nway_restart
   mod_timer
   __msecs_to_jiffies
   msleep
@@ -168,6 +174,8 @@
   param_ops_ullong
   param_set_uint
   __per_cpu_offset
+  phy_resolve_aneg_linkmode
+  phy_start_aneg
   __platform_driver_register
   platform_driver_unregister
   preempt_schedule
@@ -305,6 +313,8 @@
   unregister_restart_handler
   unregister_syscore_ops
   up_write
+  usbnet_get_endpoints
+  usbnet_link_change
   vfree
   vfs_fsync_range
   vmalloc