diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 87491603dded..184a3b5106ba 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -5383,6 +5383,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1d6740b1
 }
+pointer_reference {
+  id: 0x0dca21d4
+  kind: POINTER
+  pointee_type_id: 0x1d6861ce
+}
 pointer_reference {
   id: 0x0dcbeae6
   kind: POINTER
@@ -10548,6 +10553,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x58912da5
 }
+pointer_reference {
+  id: 0x1cba6ba2
+  kind: POINTER
+  pointee_type_id: 0x58a94817
+}
 pointer_reference {
   id: 0x1cc18442
   kind: POINTER
@@ -20048,6 +20058,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x906c53c0
 }
+pointer_reference {
+  id: 0x2e8c0d7b
+  kind: POINTER
+  pointee_type_id: 0x9070d372
+}
 pointer_reference {
   id: 0x2e8c7bd9
   kind: POINTER
@@ -20068,6 +20083,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9078a69f
 }
+pointer_reference {
+  id: 0x2e8e5582
+  kind: POINTER
+  pointee_type_id: 0x9079b097
+}
 pointer_reference {
   id: 0x2e8ed696
   kind: POINTER
@@ -20258,6 +20278,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9095e0a9
 }
+pointer_reference {
+  id: 0x2eb6a848
+  kind: POINTER
+  pointee_type_id: 0x909a47bd
+}
 pointer_reference {
   id: 0x2eb6ced9
   kind: POINTER
@@ -23593,6 +23618,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe32fa2b6
 }
+pointer_reference {
+  id: 0x32618dc6
+  kind: POINTER
+  pointee_type_id: 0xe3c6d185
+}
 pointer_reference {
   id: 0x326663cd
   kind: POINTER
@@ -23738,6 +23768,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe08cc03f
 }
+pointer_reference {
+  id: 0x32b472a5
+  kind: POINTER
+  pointee_type_id: 0xe0912c08
+}
 pointer_reference {
   id: 0x32b54b11
   kind: POINTER
@@ -24443,6 +24478,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfa0fa371
 }
+pointer_reference {
+  id: 0x3417d991
+  kind: POINTER
+  pointee_type_id: 0xfa1f80d8
+}
 pointer_reference {
   id: 0x34192ccc
   kind: POINTER
@@ -24713,6 +24753,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf87d4486
 }
+pointer_reference {
+  id: 0x348f7ef2
+  kind: POINTER
+  pointee_type_id: 0xf87d1d57
+}
 pointer_reference {
   id: 0x348f9528
   kind: POINTER
@@ -25543,6 +25588,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf34f7202
 }
+pointer_reference {
+  id: 0x364a10f4
+  kind: POINTER
+  pointee_type_id: 0xf368a54d
+}
 pointer_reference {
   id: 0x364efcf0
   kind: POINTER
@@ -25608,6 +25658,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf39c3f1e
 }
+pointer_reference {
+  id: 0x367f8642
+  kind: POINTER
+  pointee_type_id: 0xf3beff96
+}
 pointer_reference {
   id: 0x36841126
   kind: POINTER
@@ -26238,6 +26293,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf4a306a1
 }
+pointer_reference {
+  id: 0x37c0c175
+  kind: POINTER
+  pointee_type_id: 0xf543e34b
+}
 pointer_reference {
   id: 0x37c1fe6c
   kind: POINTER
@@ -26443,6 +26503,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xca7029d8
 }
+pointer_reference {
+  id: 0x3812c788
+  kind: POINTER
+  pointee_type_id: 0xca0bf8bc
+}
 pointer_reference {
   id: 0x381472e2
   kind: POINTER
@@ -26793,6 +26858,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc94d23ab
 }
+pointer_reference {
+  id: 0x38c3d772
+  kind: POINTER
+  pointee_type_id: 0xc94fbb56
+}
 pointer_reference {
   id: 0x38c5be1f
   kind: POINTER
@@ -27573,6 +27643,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc035887a
 }
+pointer_reference {
+  id: 0x3aa533cf
+  kind: POINTER
+  pointee_type_id: 0xc0d429a1
+}
 pointer_reference {
   id: 0x3aac87ab
   kind: POINTER
@@ -28533,6 +28608,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd920878f
 }
+pointer_reference {
+  id: 0x3cdda08b
+  kind: POINTER
+  pointee_type_id: 0xd93664b2
+}
 pointer_reference {
   id: 0x3ce1bbd3
   kind: POINTER
@@ -29098,6 +29178,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd23047c9
 }
+pointer_reference {
+  id: 0x3e21070b
+  kind: POINTER
+  pointee_type_id: 0xd2c4fab2
+}
 pointer_reference {
   id: 0x3e279e0a
   kind: POINTER
@@ -29478,6 +29563,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd66432be
 }
+pointer_reference {
+  id: 0x3f09383b
+  kind: POINTER
+  pointee_type_id: 0xd6640671
+}
 pointer_reference {
   id: 0x3f095459
   kind: POINTER
@@ -32238,6 +32328,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x72ec8660
 }
+qualified {
+  id: 0xc0d429a1
+  qualifier: CONST
+  qualified_type_id: 0x7317100c
+}
 qualified {
   id: 0xc12aa3e6
   qualifier: CONST
@@ -32658,6 +32753,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x55733825
 }
+qualified {
+  id: 0xc94fbb56
+  qualifier: CONST
+  qualified_type_id: 0x55795bd3
+}
 qualified {
   id: 0xc97bedb7
   qualifier: CONST
@@ -32673,6 +32773,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x5786c646
 }
+qualified {
+  id: 0xca0bf8bc
+  qualifier: CONST
+  qualified_type_id: 0x58685478
+}
 qualified {
   id: 0xca2c0eb3
   qualifier: CONST
@@ -33208,6 +33313,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x399c459b
 }
+qualified {
+  id: 0xd2c4fab2
+  qualifier: CONST
+  qualified_type_id: 0x3b545c43
+}
 qualified {
   id: 0xd2d7132a
   qualifier: CONST
@@ -33368,6 +33478,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x29600806
 }
+qualified {
+  id: 0xd6640671
+  qualifier: CONST
+  qualified_type_id: 0x29d7af4d
+}
 qualified {
   id: 0xd66432be
   qualifier: CONST
@@ -33518,6 +33633,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x13b5a562
 }
+qualified {
+  id: 0xd93664b2
+  qualifier: CONST
+  qualified_type_id: 0x149e2442
+}
 qualified {
   id: 0xd957a3fb
   qualifier: CONST
@@ -33978,6 +34098,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xf274b676
 }
+qualified {
+  id: 0xe0912c08
+  qualifier: CONST
+  qualified_type_id: 0xf20306a8
+}
 qualified {
   id: 0xe095cad8
   qualifier: CONST
@@ -34978,6 +35103,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xbd7a7e80
 }
+qualified {
+  id: 0xf368a54d
+  qualifier: CONST
+  qualified_type_id: 0xbde523bd
+}
 qualified {
   id: 0xf39072f0
   qualifier: CONST
@@ -35243,6 +35373,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x91b5a647
 }
+qualified {
+  id: 0xf87d1d57
+  qualifier: CONST
+  qualified_type_id: 0x91b3c3d5
+}
 qualified {
   id: 0xf87f5460
   qualifier: CONST
@@ -40461,6 +40596,11 @@ member {
   type_id: 0x56037e9c
   offset: 1408
 }
+member {
+  id: 0x36707bb7
+  type_id: 0x56efb9c6
+  offset: 128
+}
 member {
   id: 0x36752018
   type_id: 0x56faddc1
@@ -45484,6 +45624,12 @@ member {
   type_id: 0x2dd03fae
   offset: 320
 }
+member {
+  id: 0xd7bdfbb1
+  name: "aggregate"
+  type_id: 0x2dd03fae
+  offset: 64
+}
 member {
   id: 0x9b642e7a
   name: "ah_ip4_spec"
@@ -50407,6 +50553,12 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
+member {
+  id: 0xd3de74cf
+  name: "atom_size"
+  type_id: 0x4585663f
+  offset: 256
+}
 member {
   id: 0x176dead7
   name: "atomic"
@@ -53379,6 +53531,12 @@ member {
   type_id: 0xe04f9dc7
   offset: 704
 }
+member {
+  id: 0xbc613338
+  name: "bcast_ch_regs"
+  type_id: 0x18bd6530
+  offset: 256
+}
 member {
   id: 0x638c2bea
   name: "bcdCDC"
@@ -54427,6 +54585,18 @@ member {
   type_id: 0x295c7202
   offset: 40
 }
+member {
+  id: 0x13de4517
+  name: "bit"
+  type_id: 0x4585663f
+  offset: 224
+}
+member {
+  id: 0x13de4b08
+  name: "bit"
+  type_id: 0x4585663f
+  offset: 32
+}
 member {
   id: 0xdd1aee2e
   name: "bit_count"
@@ -55004,6 +55174,12 @@ member {
   type_id: 0xe8034002
   offset: 13456
 }
+member {
+  id: 0x9728511c
+  name: "block_dma"
+  type_id: 0x2eb6a848
+  offset: 128
+}
 member {
   id: 0xecca238a
   name: "block_h"
@@ -60665,6 +60841,12 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
+member {
+  id: 0x20f935a9
+  name: "ch_intmask"
+  type_id: 0xc9082b19
+  offset: 416
+}
 member {
   id: 0x2054ca12
   name: "ch_mode"
@@ -60677,6 +60859,12 @@ member {
   type_id: 0xe62ebf07
   offset: 64
 }
+member {
+  id: 0x46f26d43
+  name: "ch_regs"
+  type_id: 0x0cbf60eb
+  offset: 320
+}
 member {
   id: 0x152992ef
   name: "chain"
@@ -62696,6 +62884,12 @@ member {
   type_id: 0x18bd6530
   offset: 3456
 }
+member {
+  id: 0x685f31a0
+  name: "client_id_mask"
+  type_id: 0x914dbfdc
+  offset: 288
+}
 member {
   id: 0xf4c5928f
   name: "client_list"
@@ -62720,6 +62914,11 @@ member {
   type_id: 0xa7c362b0
   offset: 2432
 }
+member {
+  id: 0x1b57faed
+  name: "clients"
+  type_id: 0x38c3d772
+}
 member {
   id: 0x1bbcf6b9
   name: "clients"
@@ -62779,6 +62978,12 @@ member {
   name: "clk"
   type_id: 0x3dcee85d
 }
+member {
+  id: 0xc8e82903
+  name: "clk"
+  type_id: 0x3dcee85d
+  offset: 384
+}
 member {
   id: 0xc8e82c70
   name: "clk"
@@ -66636,6 +66841,12 @@ member {
   type_id: 0x0baa70a7
   offset: 96
 }
+member {
+  id: 0xfc79e947
+  name: "control"
+  type_id: 0x4585663f
+  offset: 128
+}
 member {
   id: 0xfcf56dc8
   name: "control"
@@ -72778,6 +72989,12 @@ member {
   type_id: 0x03913382
   offset: 62528
 }
+member {
+  id: 0x1c1be12d
+  name: "debugfs"
+  type_id: 0x3c9f0fa2
+  offset: 2368
+}
 member {
   id: 0x1c35735f
   name: "debugfs"
@@ -73125,6 +73342,12 @@ member {
   type_id: 0x4585663f
   offset: 32
 }
+member {
+  id: 0xea7685d3
+  name: "def"
+  type_id: 0x4585663f
+  offset: 96
+}
 member {
   id: 0xffdeb7b9
   name: "def_br_lsto"
@@ -78953,6 +79176,12 @@ member {
   type_id: 0xf435685e
   offset: 19264
 }
+member {
+  id: 0x4c6d670f
+  name: "dma_idling"
+  type_id: 0x367f8642
+  offset: 192
+}
 member {
   id: 0xf4c016ce
   name: "dma_io_tlb_mem"
@@ -82950,6 +83179,18 @@ member {
   type_id: 0x295c7202
   offset: 11912
 }
+member {
+  id: 0x321ff48e
+  name: "emem_data"
+  type_id: 0x38d23361
+  offset: 64
+}
+member {
+  id: 0x4ffc68c3
+  name: "emem_regs"
+  type_id: 0x3ea31487
+  offset: 128
+}
 member {
   id: 0xfcf1c4f6
   name: "emin"
@@ -89810,6 +90051,12 @@ member {
   type_id: 0x0e5445cf
   offset: 640
 }
+member {
+  id: 0xf67ca58b
+  name: "fifo_size"
+  type_id: 0x4585663f
+  offset: 160
+}
 member {
   id: 0xf67ca8c0
   name: "fifo_size"
@@ -96167,6 +96414,12 @@ member {
   type_id: 0x295c7202
   offset: 1080
 }
+member {
+  id: 0xf5682334
+  name: "gart"
+  type_id: 0x1cba6ba2
+  offset: 128
+}
 member {
   id: 0x16b7aef5
   name: "gate"
@@ -98584,6 +98837,12 @@ member {
   type_id: 0x49a73111
   offset: 2304
 }
+member {
+  id: 0x7fbcccea
+  name: "global_intstatus_channel_shift"
+  type_id: 0xc9082b19
+  offset: 448
+}
 member {
   id: 0x88f8622b
   name: "global_l"
@@ -99290,6 +99549,12 @@ member {
   type_id: 0x3776a166
   offset: 128
 }
+member {
+  id: 0x933b8dad
+  name: "groups"
+  type_id: 0x3cdda08b
+  offset: 256
+}
 member {
   id: 0x9342d5c0
   name: "groups"
@@ -99721,6 +99986,12 @@ member {
   type_id: 0x2dfb782b
   offset: 960
 }
+member {
+  id: 0x72a70f4f
+  name: "handle_irq"
+  type_id: 0x044ba8c8
+  offset: 256
+}
 member {
   id: 0x33f92e8a
   name: "handle_kick"
@@ -99998,6 +100269,12 @@ member {
   type_id: 0x2c494e22
   offset: 192
 }
+member {
+  id: 0x3ec0be10
+  name: "has_addr_hi_reg"
+  type_id: 0x6d7f5ff6
+  offset: 480
+}
 member {
   id: 0xeee91e70
   name: "has_alpha"
@@ -102686,6 +102963,17 @@ member {
   type_id: 0xdba44af3
   offset: 26944
 }
+member {
+  id: 0x2ff7d481
+  name: "hotreset_assert"
+  type_id: 0x2eb6a848
+}
+member {
+  id: 0xb245cfae
+  name: "hotreset_deassert"
+  type_id: 0x2eb6a848
+  offset: 64
+}
 member {
   id: 0x354661e5
   name: "hour"
@@ -104620,6 +104908,12 @@ member {
   offset: 416
   bitsize: 1
 }
+member {
+  id: 0x0c93d7b1
+  name: "icc_ops"
+  type_id: 0x3e21070b
+  offset: 704
+}
 member {
   id: 0x9dfcef2c
   name: "icc_paths"
@@ -105072,6 +105366,12 @@ member {
   type_id: 0x37145079
   offset: 1608
 }
+member {
+  id: 0xcc1c5d14
+  name: "id"
+  type_id: 0x33756485
+  offset: 64
+}
 member {
   id: 0xcc248bda
   name: "id"
@@ -110149,6 +110449,12 @@ member {
   type_id: 0x3ae3ff84
   offset: 1088
 }
+member {
+  id: 0x1b9b6526
+  name: "intmask"
+  type_id: 0xc9082b19
+  offset: 384
+}
 member {
   id: 0x5dfd62b5
   name: "intr_cmd"
@@ -111810,6 +112116,12 @@ member {
   type_id: 0x6720d32f
   offset: 320
 }
+member {
+  id: 0x99159291
+  name: "irq"
+  type_id: 0x6720d32f
+  offset: 448
+}
 member {
   id: 0x99159514
   name: "irq"
@@ -115398,6 +115710,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 296
 }
+member {
+  id: 0x1713d000
+  name: "la"
+  type_id: 0x1ba1b239
+  offset: 64
+}
 member {
   id: 0xbe79d648
   name: "la_mask"
@@ -119901,6 +120219,12 @@ member {
   type_id: 0xf313e71a
   offset: 320
 }
+member {
+  id: 0x2d1feb8e
+  name: "lock"
+  type_id: 0xf313e71a
+  offset: 2304
+}
 member {
   id: 0x2d1feb9a
   name: "lock"
@@ -139222,6 +139546,12 @@ member {
   type_id: 0x33756485
   offset: 704
 }
+member {
+  id: 0x4b9a0804
+  name: "num_address_bits"
+  type_id: 0x4585663f
+  offset: 224
+}
 member {
   id: 0x4b1eeeac
   name: "num_agents"
@@ -139263,6 +139593,12 @@ member {
   type_id: 0xc9082b19
   offset: 128
 }
+member {
+  id: 0x29605801
+  name: "num_asids"
+  type_id: 0x4585663f
+  offset: 416
+}
 member {
   id: 0x4a3e96b6
   name: "num_auto_selectable_formats"
@@ -139376,6 +139712,12 @@ member {
   type_id: 0x6720d32f
   offset: 8384
 }
+member {
+  id: 0x5fe2c2d5
+  name: "num_channels"
+  type_id: 0x295c7202
+  offset: 304
+}
 member {
   id: 0xc21eb7ca
   name: "num_chans"
@@ -139400,6 +139742,12 @@ member {
   type_id: 0x914dbfdc
   offset: 7440
 }
+member {
+  id: 0xe6531f76
+  name: "num_clients"
+  type_id: 0x4585663f
+  offset: 64
+}
 member {
   id: 0x1c9b1176
   name: "num_clips"
@@ -139638,6 +139986,12 @@ member {
   type_id: 0x0baa70a7
   offset: 64
 }
+member {
+  id: 0x8f1bb1bf
+  name: "num_emem_regs"
+  type_id: 0x4585663f
+  offset: 192
+}
 member {
   id: 0x4a422b42
   name: "num_encoder"
@@ -139799,6 +140153,12 @@ member {
   type_id: 0x4585663f
   offset: 448
 }
+member {
+  id: 0x1eceb58f
+  name: "num_groups"
+  type_id: 0x4585663f
+  offset: 320
+}
 member {
   id: 0x0a575aaf
   name: "num_h_tile"
@@ -140448,6 +140808,12 @@ member {
   type_id: 0x4585663f
   offset: 384
 }
+member {
+  id: 0xfe804b5a
+  name: "num_resets"
+  type_id: 0x4585663f
+  offset: 640
+}
 member {
   id: 0xdc465f86
   name: "num_resources"
@@ -140658,6 +141024,18 @@ member {
   type_id: 0x4585663f
   offset: 192
 }
+member {
+  id: 0x3a29648c
+  name: "num_swgroups"
+  type_id: 0x4585663f
+  offset: 192
+}
+member {
+  id: 0x3a296587
+  name: "num_swgroups"
+  type_id: 0x4585663f
+  offset: 128
+}
 member {
   id: 0x313aeebb
   name: "num_syms"
@@ -140724,6 +141102,18 @@ member {
   name: "num_timings"
   type_id: 0x4585663f
 }
+member {
+  id: 0x349422f9
+  name: "num_timings"
+  type_id: 0x4585663f
+  offset: 704
+}
+member {
+  id: 0xb021dbba
+  name: "num_tlb_lines"
+  type_id: 0x4585663f
+  offset: 384
+}
 member {
   id: 0x8026d50a
   name: "num_total_plane"
@@ -143550,6 +143940,12 @@ member {
   name: "ops"
   type_id: 0x326a19f7
 }
+member {
+  id: 0xafb9bc7f
+  name: "ops"
+  type_id: 0x32b472a5
+  offset: 768
+}
 member {
   id: 0xafb9c47f
   name: "ops"
@@ -144793,6 +145189,11 @@ member {
   type_id: 0x6720d32f
   offset: 288
 }
+member {
+  id: 0xd2c76e4c
+  name: "override"
+  type_id: 0x4585663f
+}
 member {
   id: 0xb4e4bcf1
   name: "override_edid"
@@ -155810,6 +156211,11 @@ member {
   type_id: 0x2e7404d6
   offset: 128
 }
+member {
+  id: 0xd7788f3a
+  name: "probe"
+  type_id: 0x2e8c0d7b
+}
 member {
   id: 0xd778c72d
   name: "probe"
@@ -155965,6 +156371,12 @@ member {
   type_id: 0x3daf8dd1
   offset: 128
 }
+member {
+  id: 0xe5f24cd0
+  name: "probe_device"
+  type_id: 0x2e8e5582
+  offset: 320
+}
 member {
   id: 0xf6b66ca8
   name: "probe_finalize"
@@ -157289,6 +157701,12 @@ member {
   type_id: 0x32c23ae3
   offset: 256
 }
+member {
+  id: 0x86b9fc17
+  name: "provider"
+  type_id: 0xe1480d10
+  offset: 1472
+}
 member {
   id: 0xa159a1de
   name: "provider_data"
@@ -163364,6 +163782,12 @@ member {
   type_id: 0x4585663f
   offset: 128
 }
+member {
+  id: 0x0f050edd
+  name: "reg"
+  type_id: 0x4585663f
+  offset: 96
+}
 member {
   id: 0x0f27a2eb
   name: "reg"
@@ -164007,12 +164431,24 @@ member {
   name: "regs"
   type_id: 0x34def0b7
 }
+member {
+  id: 0x8011b26a
+  name: "regs"
+  type_id: 0x2accfd18
+  offset: 192
+}
 member {
   id: 0x8023c171
   name: "regs"
   type_id: 0x18bd6530
   offset: 3456
 }
+member {
+  id: 0x8023c3f2
+  name: "regs"
+  type_id: 0x18bd6530
+  offset: 192
+}
 member {
   id: 0x8023cc24
   name: "regs"
@@ -164979,6 +165415,12 @@ member {
   name: "remove"
   type_id: 0x0dd7b940
 }
+member {
+  id: 0xb4ae1e7a
+  name: "remove"
+  type_id: 0x0dca21d4
+  offset: 64
+}
 member {
   id: 0xb4ae4933
   name: "remove"
@@ -167136,6 +167578,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 216
 }
+member {
+  id: 0x621c7011
+  name: "reset"
+  type_id: 0xa1d6f6c0
+  offset: 768
+}
 member {
   id: 0x6290827d
   name: "reset"
@@ -167265,6 +167713,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 512
 }
+member {
+  id: 0x62f823e6
+  name: "reset"
+  type_id: 0x4585663f
+  offset: 192
+}
 member {
   id: 0x147cd330
   name: "reset_assert_delay"
@@ -167380,6 +167834,12 @@ member {
   type_id: 0x0d9c4ffe
   offset: 256
 }
+member {
+  id: 0x69014681
+  name: "reset_ops"
+  type_id: 0x364a10f4
+  offset: 512
+}
 member {
   id: 0x98c83941
   name: "reset_pending"
@@ -167441,6 +167901,12 @@ member {
   type_id: 0x2ced3956
   offset: 512
 }
+member {
+  id: 0x4d689b1d
+  name: "reset_status"
+  type_id: 0x2eb6a848
+  offset: 320
+}
 member {
   id: 0xf24ab676
   name: "reset_system"
@@ -167477,6 +167943,12 @@ member {
   type_id: 0x1f3c8679
   offset: 7744
 }
+member {
+  id: 0x54c3a704
+  name: "resets"
+  type_id: 0x3aa533cf
+  offset: 576
+}
 member {
   id: 0x4381fffc
   name: "resetting_device"
@@ -168036,6 +168508,12 @@ member {
   type_id: 0x2ee76b64
   offset: 2240
 }
+member {
+  id: 0xcab164a8
+  name: "resume"
+  type_id: 0x2e8c0d7b
+  offset: 192
+}
 member {
   id: 0xcab17152
   name: "resume"
@@ -169245,6 +169723,11 @@ member {
   type_id: 0x120540d1
   offset: 640
 }
+member {
+  id: 0x93cd2de4
+  name: "root"
+  type_id: 0x120540d1
+}
 member {
   id: 0x93d246f9
   name: "root"
@@ -174917,6 +175400,12 @@ member {
   type_id: 0x18bd6530
   offset: 7680
 }
+member {
+  id: 0xf1c9d4d6
+  name: "security"
+  type_id: 0x4585663f
+  offset: 32
+}
 member {
   id: 0xad84e518
   name: "security_cfm"
@@ -176281,6 +176770,11 @@ member {
   type_id: 0x2d1b3b77
   offset: 256
 }
+member {
+  id: 0x3df35bca
+  name: "set"
+  type_id: 0x2d1b3b77
+}
 member {
   id: 0x8fd22bb3
   name: "set_ackreq_default"
@@ -179439,12 +179933,23 @@ member {
   type_id: 0xd3c80119
   offset: 64
 }
+member {
+  id: 0x081eac68
+  name: "sid"
+  type_id: 0x2ce1ed3d
+  offset: 192
+}
 member {
   id: 0x086ca956
   name: "sid"
   type_id: 0x5eeb4a25
   offset: 1472
 }
+member {
+  id: 0x0877c02a
+  name: "sid"
+  type_id: 0x4585663f
+}
 member {
   id: 0x08a308f3
   name: "sid"
@@ -182014,6 +182519,23 @@ member {
   type_id: 0x2e0f9112
   offset: 384
 }
+member {
+  id: 0xca95fcc2
+  name: "smmu"
+  type_id: 0x1ba9f29e
+}
+member {
+  id: 0xcab15bcf
+  name: "smmu"
+  type_id: 0x3f09383b
+  offset: 320
+}
+member {
+  id: 0xcabc305c
+  name: "smmu"
+  type_id: 0x32618dc6
+  offset: 64
+}
 member {
   id: 0x0c1eb745
   name: "smp"
@@ -182273,6 +182795,12 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
+member {
+  id: 0xb0492744
+  name: "soc"
+  type_id: 0x348f7ef2
+  offset: 512
+}
 member {
   id: 0x3de92190
   name: "soc_dev_num"
@@ -186146,6 +186674,12 @@ member {
   type_id: 0x4585663f
   offset: 1248
 }
+member {
+  id: 0x2022af02
+  name: "status"
+  type_id: 0x4585663f
+  offset: 160
+}
 member {
   id: 0x2027a418
   name: "status"
@@ -188171,6 +188705,12 @@ member {
   type_id: 0x3500e23a
   offset: 64
 }
+member {
+  id: 0x009679b8
+  name: "supports_request_limit"
+  type_id: 0x6d7f5ff6
+  offset: 360
+}
 member {
   id: 0x065dd0db
   name: "supports_requests"
@@ -188178,6 +188718,12 @@ member {
   offset: 197
   bitsize: 1
 }
+member {
+  id: 0xe739cbf3
+  name: "supports_round_robin_arbitration"
+  type_id: 0x6d7f5ff6
+  offset: 352
+}
 member {
   id: 0x505b26be
   name: "suppress"
@@ -188256,6 +188802,12 @@ member {
   type_id: 0x2e9195ef
   offset: 192
 }
+member {
+  id: 0xf39453f6
+  name: "suspend"
+  type_id: 0x2e8c0d7b
+  offset: 128
+}
 member {
   id: 0xf394d5ee
   name: "suspend"
@@ -188940,6 +189492,29 @@ member {
   type_id: 0xb914bfab
   offset: 1600
 }
+member {
+  id: 0x005de33e
+  name: "swgroup"
+  type_id: 0x4585663f
+  offset: 64
+}
+member {
+  id: 0x005de7df
+  name: "swgroup"
+  type_id: 0x4585663f
+}
+member {
+  id: 0x3f043e5d
+  name: "swgroups"
+  type_id: 0x3812c788
+  offset: 128
+}
+member {
+  id: 0x3f05edad
+  name: "swgroups"
+  type_id: 0x39cc14ac
+  offset: 64
+}
 member {
   id: 0x0bc9608d
   name: "switch_id"
@@ -193028,6 +193603,12 @@ member {
   type_id: 0x3df0a7d3
   offset: 128
 }
+member {
+  id: 0xe87350be
+  name: "tick"
+  type_id: 0x33756485
+  offset: 576
+}
 member {
   id: 0xe879699b
   name: "tick"
@@ -193953,6 +194534,12 @@ member {
   type_id: 0x3ebb35fd
   offset: 1280
 }
+member {
+  id: 0x1f6d9836
+  name: "timings"
+  type_id: 0x3417d991
+  offset: 640
+}
 member {
   id: 0x1fa42388
   name: "timings"
@@ -200656,6 +201243,12 @@ member {
   type_id: 0x0eb62dc3
   offset: 320
 }
+member {
+  id: 0xea5b0b9a
+  name: "unblock_dma"
+  type_id: 0x2eb6a848
+  offset: 256
+}
 member {
   id: 0x5c7ec059
   name: "unbound_attrs"
@@ -210788,6 +211381,12 @@ member {
   type_id: 0x01d9df85
   offset: 576
 }
+member {
+  id: 0x0b59f1cd
+  name: "xlate_extended"
+  type_id: 0x01d9df85
+  offset: 128
+}
 member {
   id: 0xee360321
   name: "xlate_tdm_slot_mask"
@@ -213434,6 +214033,26 @@ struct_union {
     member_id: 0xf5eb6708
   }
 }
+struct_union {
+  id: 0x1ba1b239
+  kind: STRUCT
+  definition {
+    bytesize: 16
+    member_id: 0x0f05075e
+    member_id: 0x3274483b
+    member_id: 0xa876e8aa
+    member_id: 0xea7685d3
+  }
+}
+struct_union {
+  id: 0x1ba9f29e
+  kind: STRUCT
+  definition {
+    bytesize: 8
+    member_id: 0x0f05075e
+    member_id: 0x13de4b08
+  }
+}
 struct_union {
   id: 0x1c07f73e
   kind: STRUCT
@@ -214101,6 +214720,16 @@ struct_union {
     member_id: 0x642f0821
   }
 }
+struct_union {
+  id: 0x2accfd18
+  kind: STRUCT
+  definition {
+    bytesize: 32
+    member_id: 0xca95fcc2
+    member_id: 0x1713d000
+    member_id: 0x081eac68
+  }
+}
 struct_union {
   id: 0x2b189f72
   kind: STRUCT
@@ -214212,6 +214841,15 @@ struct_union {
     member_id: 0x3e7e5067
   }
 }
+struct_union {
+  id: 0x2ce1ed3d
+  kind: STRUCT
+  definition {
+    bytesize: 8
+    member_id: 0xd2c76e4c
+    member_id: 0xf1c9d4d6
+  }
+}
 struct_union {
   id: 0x2d07e8c3
   kind: STRUCT
@@ -215047,6 +215685,14 @@ struct_union {
     member_id: 0xc101e64f
   }
 }
+struct_union {
+  id: 0x3c9f0fa2
+  kind: STRUCT
+  definition {
+    bytesize: 8
+    member_id: 0x93cd2de4
+  }
+}
 struct_union {
   id: 0x3ce2dc79
   kind: STRUCT
@@ -216375,6 +217021,15 @@ struct_union {
     member_id: 0x4380fca4
   }
 }
+struct_union {
+  id: 0x56efb9c6
+  kind: UNION
+  definition {
+    bytesize: 4
+    member_id: 0x005de7df
+    member_id: 0x0877c02a
+  }
+}
 struct_union {
   id: 0x56faddc1
   kind: UNION
@@ -234649,6 +235304,11 @@ struct_union {
     member_id: 0x34fb052c
   }
 }
+struct_union {
+  id: 0x58a94817
+  kind: STRUCT
+  name: "gart_device"
+}
 struct_union {
   id: 0x78ef929d
   kind: STRUCT
@@ -262972,6 +263632,177 @@ struct_union {
     member_id: 0x08c59955
   }
 }
+struct_union {
+  id: 0xf543e34b
+  kind: STRUCT
+  name: "tegra_mc"
+  definition {
+    bytesize: 304
+    member_id: 0xce3bbab3
+    member_id: 0xcabc305c
+    member_id: 0xf5682334
+    member_id: 0x8023c3f2
+    member_id: 0xbc613338
+    member_id: 0x46f26d43
+    member_id: 0xc8e82903
+    member_id: 0x99159291
+    member_id: 0xb0492744
+    member_id: 0xe87350be
+    member_id: 0x1f6d9836
+    member_id: 0x349422f9
+    member_id: 0x621c7011
+    member_id: 0x86b9fc17
+    member_id: 0x2d1feb8e
+    member_id: 0x1c1be12d
+  }
+}
+struct_union {
+  id: 0x55795bd3
+  kind: STRUCT
+  name: "tegra_mc_client"
+  definition {
+    bytesize: 56
+    member_id: 0xcc6aa9f7
+    member_id: 0x0de57809
+    member_id: 0x36707bb7
+    member_id: 0xf67ca58b
+    member_id: 0x8011b26a
+  }
+}
+struct_union {
+  id: 0x3b545c43
+  kind: STRUCT
+  name: "tegra_mc_icc_ops"
+  definition {
+    bytesize: 24
+    member_id: 0x3df35bca
+    member_id: 0xd7bdfbb1
+    member_id: 0x0b59f1cd
+  }
+}
+struct_union {
+  id: 0xf20306a8
+  kind: STRUCT
+  name: "tegra_mc_ops"
+  definition {
+    bytesize: 48
+    member_id: 0xd7788f3a
+    member_id: 0xb4ae1e7a
+    member_id: 0xf39453f6
+    member_id: 0xcab164a8
+    member_id: 0x72a70f4f
+    member_id: 0xe5f24cd0
+  }
+}
+struct_union {
+  id: 0x7317100c
+  kind: STRUCT
+  name: "tegra_mc_reset"
+  definition {
+    bytesize: 32
+    member_id: 0x0de57ce8
+    member_id: 0xcc1c5d14
+    member_id: 0xfc79e947
+    member_id: 0x2022af02
+    member_id: 0x62f823e6
+    member_id: 0x13de4517
+  }
+}
+struct_union {
+  id: 0xbde523bd
+  kind: STRUCT
+  name: "tegra_mc_reset_ops"
+  definition {
+    bytesize: 48
+    member_id: 0x2ff7d481
+    member_id: 0xb245cfae
+    member_id: 0x9728511c
+    member_id: 0x4c6d670f
+    member_id: 0xea5b0b9a
+    member_id: 0x4d689b1d
+  }
+}
+struct_union {
+  id: 0x91b3c3d5
+  kind: STRUCT
+  name: "tegra_mc_soc"
+  definition {
+    bytesize: 104
+    member_id: 0x1b57faed
+    member_id: 0xe6531f76
+    member_id: 0x4ffc68c3
+    member_id: 0x8f1bb1bf
+    member_id: 0x4b9a0804
+    member_id: 0xd3de74cf
+    member_id: 0x685f31a0
+    member_id: 0x5fe2c2d5
+    member_id: 0xcab15bcf
+    member_id: 0x1b9b6526
+    member_id: 0x20f935a9
+    member_id: 0x7fbcccea
+    member_id: 0x3ec0be10
+    member_id: 0x69014681
+    member_id: 0x54c3a704
+    member_id: 0xfe804b5a
+    member_id: 0x0c93d7b1
+    member_id: 0xafb9bc7f
+  }
+}
+struct_union {
+  id: 0xfa1f80d8
+  kind: STRUCT
+  name: "tegra_mc_timing"
+  definition {
+    bytesize: 16
+    member_id: 0x5fe1279a
+    member_id: 0x321ff48e
+  }
+}
+struct_union {
+  id: 0xe3c6d185
+  kind: STRUCT
+  name: "tegra_smmu"
+}
+struct_union {
+  id: 0x149e2442
+  kind: STRUCT
+  name: "tegra_smmu_group_soc"
+  definition {
+    bytesize: 24
+    member_id: 0x0de57ce8
+    member_id: 0x3f05edad
+    member_id: 0x3a296587
+  }
+}
+struct_union {
+  id: 0x29d7af4d
+  kind: STRUCT
+  name: "tegra_smmu_soc"
+  definition {
+    bytesize: 56
+    member_id: 0x1b57faed
+    member_id: 0xe6531f76
+    member_id: 0x3f043e5d
+    member_id: 0x3a29648c
+    member_id: 0x933b8dad
+    member_id: 0x1eceb58f
+    member_id: 0xe739cbf3
+    member_id: 0x009679b8
+    member_id: 0xb021dbba
+    member_id: 0x29605801
+  }
+}
+struct_union {
+  id: 0x58685478
+  kind: STRUCT
+  name: "tegra_smmu_swgroup"
+  definition {
+    bytesize: 16
+    member_id: 0x0de57ce8
+    member_id: 0x005de33e
+    member_id: 0x0f050edd
+  }
+}
 struct_union {
   id: 0x6a268aa0
   kind: STRUCT
@@ -301359,6 +302190,11 @@ function {
   parameter_id: 0x1d44326e
   parameter_id: 0xf1a6dfed
 }
+function {
+  id: 0x1d6861ce
+  return_type_id: 0x48b5725f
+  parameter_id: 0x37c0c175
+}
 function {
   id: 0x1d6aeee7
   return_type_id: 0x48b5725f
@@ -303687,6 +304523,11 @@ function {
   parameter_id: 0xfc0e1dbd
   parameter_id: 0x01222f7d
 }
+function {
+  id: 0x2195423c
+  return_type_id: 0x37c0c175
+  parameter_id: 0x0258f96e
+}
 function {
   id: 0x21a7fa19
   return_type_id: 0x145f7b00
@@ -310235,6 +311076,11 @@ function {
   parameter_id: 0x36337082
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x9070d372
+  return_type_id: 0x6720d32f
+  parameter_id: 0x37c0c175
+}
 function {
   id: 0x907109f8
   return_type_id: 0x6720d32f
@@ -310298,6 +311144,12 @@ function {
   parameter_id: 0x3aff5796
   parameter_id: 0x0258f96e
 }
+function {
+  id: 0x9079b097
+  return_type_id: 0x6720d32f
+  parameter_id: 0x37c0c175
+  parameter_id: 0x0258f96e
+}
 function {
   id: 0x908495c3
   return_type_id: 0x6720d32f
@@ -310428,6 +311280,12 @@ function {
   parameter_id: 0xe8034002
   parameter_id: 0xe8034002
 }
+function {
+  id: 0x909a47bd
+  return_type_id: 0x6720d32f
+  parameter_id: 0x37c0c175
+  parameter_id: 0x3aa533cf
+}
 function {
   id: 0x909bddf8
   return_type_id: 0x6720d32f
@@ -336643,6 +337501,12 @@ function {
   return_type_id: 0x6d7f5ff6
   parameter_id: 0x347303b4
 }
+function {
+  id: 0xf3beff96
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x37c0c175
+  parameter_id: 0x3aa533cf
+}
 function {
   id: 0xf3c9c4ce
   return_type_id: 0xeb0f6de6
@@ -361025,6 +361889,15 @@ elf_symbol {
   type_id: 0x9d15ab3e
   full_name: "devm_spi_register_controller"
 }
+elf_symbol {
+  id: 0x43a4025b
+  name: "devm_tegra_memory_controller_get"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x986b8e36
+  type_id: 0x2195423c
+  full_name: "devm_tegra_memory_controller_get"
+}
 elf_symbol {
   id: 0x0dd13028
   name: "devm_thermal_of_cooling_device_register"
@@ -398780,6 +399653,15 @@ elf_symbol {
   type_id: 0x129c1f38
   full_name: "tcpm_vbus_change"
 }
+elf_symbol {
+  id: 0xa8f0fe44
+  name: "tegra_mc_probe_device"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3f100eaf
+  type_id: 0x9079b097
+  full_name: "tegra_mc_probe_device"
+}
 elf_symbol {
   id: 0x7cfd9233
   name: "teo_cpu_get_util_threshold"
@@ -411077,6 +411959,7 @@ interface {
   symbol_id: 0xd1252dfa
   symbol_id: 0xf3c9734f
   symbol_id: 0x6c9a6915
+  symbol_id: 0x43a4025b
   symbol_id: 0x0dd13028
   symbol_id: 0xfc46114a
   symbol_id: 0x5dc64161
@@ -415270,6 +416153,7 @@ interface {
   symbol_id: 0xfccd15d1
   symbol_id: 0x591431f1
   symbol_id: 0x6869c83d
+  symbol_id: 0xa8f0fe44
   symbol_id: 0x7cfd9233
   symbol_id: 0xbd25c7d0
   symbol_id: 0x5bbd3545
diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c
index 9c68b5d9188b..2345a4ad62c8 100644
--- a/android/abi_gki_aarch64_db845c
+++ b/android/abi_gki_aarch64_db845c
@@ -864,6 +864,7 @@
   device_get_dma_attr
   device_match_fwnode
   devm_krealloc
+  devm_tegra_memory_controller_get
   driver_find_device
   generic_device_group
   iommu_alloc_resv_region
@@ -880,6 +881,7 @@
   pci_device_group
   platform_irq_count
   report_iommu_fault
+  tegra_mc_probe_device
 
 # required by ath10k_core.ko
   cpu_latency_qos_add_request