diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index f71468d518d5..f089f524efee 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -861,6 +861,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x269c8e40
 }
+pointer_reference {
+  id: 0x0337b511
+  kind: POINTER
+  pointee_type_id: 0x269e32d8
+}
 pointer_reference {
   id: 0x0341bd37
   kind: POINTER
@@ -2586,6 +2591,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x0dd91f48
 }
+pointer_reference {
+  id: 0x09f1b886
+  kind: POINTER
+  pointee_type_id: 0x0d860487
+}
 pointer_reference {
   id: 0x09f23ef0
   kind: POINTER
@@ -7921,6 +7931,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6faacdf3
 }
+pointer_reference {
+  id: 0x117c83ec
+  kind: POINTER
+  pointee_type_id: 0x6fb2e92e
+}
 pointer_reference {
   id: 0x117e2995
   kind: POINTER
@@ -11026,6 +11041,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xab79b10b
 }
+pointer_reference {
+  id: 0x2054dcff
+  kind: POINTER
+  pointee_type_id: 0xab139560
+}
 pointer_reference {
   id: 0x205789b5
   kind: POINTER
@@ -12241,6 +12261,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xb037a540
 }
+pointer_reference {
+  id: 0x269e32d8
+  kind: POINTER
+  pointee_type_id: 0xb0382dfd
+}
 pointer_reference {
   id: 0x269ec837
   kind: POINTER
@@ -19856,6 +19881,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9189dbcd
 }
+pointer_reference {
+  id: 0x2ef36257
+  kind: POINTER
+  pointee_type_id: 0x918d6fc0
+}
 pointer_reference {
   id: 0x2ef36b70
   kind: POINTER
@@ -55866,6 +55896,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 256
 }
+member {
+  id: 0xb465a60b
+  name: "chained_desc"
+  type_id: 0x334927f6
+  offset: 192
+}
 member {
   id: 0xbb09fda0
   name: "chaintoolong"
@@ -62843,6 +62879,12 @@ member {
   type_id: 0x49a73111
   offset: 3072
 }
+member {
+  id: 0xe9799532
+  name: "cpuhp_memreserve_state"
+  type_id: 0x6720d32f
+  offset: 320
+}
 member {
   id: 0x01bd5464
   name: "cpuhp_node"
@@ -72998,6 +73040,12 @@ member {
   type_id: 0x914dbfdc
   offset: 16
 }
+member {
+  id: 0x9afd7b44
+  name: "dist_base"
+  type_id: 0x18bd6530
+  offset: 64
+}
 member {
   id: 0x929175ec
   name: "dist_id"
@@ -73834,6 +73882,18 @@ member {
   type_id: 0x18a2fb63
   offset: 64
 }
+member {
+  id: 0xa719db3e
+  name: "domain"
+  type_id: 0x18a2fb63
+  offset: 128
+}
+member {
+  id: 0xa719db8e
+  name: "domain"
+  type_id: 0x18a2fb63
+  offset: 576
+}
 member {
   id: 0xa72fe3f6
   name: "domain"
@@ -86144,6 +86204,24 @@ member {
   name: "flags"
   type_id: 0x92233392
 }
+member {
+  id: 0x2dfaa7c6
+  name: "flags"
+  type_id: 0x92233392
+  offset: 256
+}
+member {
+  id: 0x2dfaafa4
+  name: "flags"
+  type_id: 0x92233392
+  offset: 192
+}
+member {
+  id: 0x2dfaafc3
+  name: "flags"
+  type_id: 0x92233392
+  offset: 768
+}
 member {
   id: 0x4db09eea
   name: "flags"
@@ -91959,6 +92037,18 @@ member {
   type_id: 0xf1a6dfed
   offset: 32
 }
+member {
+  id: 0x3b2054a4
+  name: "gicd_typer"
+  type_id: 0xc9082b19
+  offset: 256
+}
+member {
+  id: 0xc50214cc
+  name: "gicd_typer2"
+  type_id: 0xc9082b19
+  offset: 288
+}
 member {
   id: 0x08bea5a0
   name: "gid"
@@ -93625,6 +93715,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 43656
 }
+member {
+  id: 0x907f5a56
+  name: "has_direct_lpi"
+  type_id: 0x6d7f5ff6
+  offset: 368
+}
 member {
   id: 0xa182581f
   name: "has_eht"
@@ -93755,6 +93851,18 @@ member {
   type_id: 0x6d7f5ff6
   offset: 8832
 }
+member {
+  id: 0x11c79ca4
+  name: "has_rss"
+  type_id: 0x6d7f5ff6
+  offset: 832
+}
+member {
+  id: 0xdda2b370
+  name: "has_rvpeid"
+  type_id: 0x6d7f5ff6
+  offset: 360
+}
 member {
   id: 0x75f4e5e7
   name: "has_second_set"
@@ -93830,6 +93938,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 112
 }
+member {
+  id: 0xd98bc305
+  name: "has_vlpis"
+  type_id: 0x6d7f5ff6
+  offset: 352
+}
 member {
   id: 0xc04ca023
   name: "has_volatiles"
@@ -93837,6 +93951,12 @@ member {
   offset: 426
   bitsize: 1
 }
+member {
+  id: 0x7a9a4a81
+  name: "has_vpend_valid_dirty"
+  type_id: 0x6d7f5ff6
+  offset: 376
+}
 member {
   id: 0xa3de0879
   name: "has_weak_ref"
@@ -116076,6 +116196,11 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
+member {
+  id: 0xa82f6dfe
+  name: "mask"
+  type_id: 0x1c04d361
+}
 member {
   id: 0xa838c0e7
   name: "mask"
@@ -130581,6 +130706,11 @@ member {
   type_id: 0x33756485
   offset: 64
 }
+member {
+  id: 0x799f8652
+  name: "nr_parts"
+  type_id: 0x6720d32f
+}
 member {
   id: 0x79bd2481
   name: "nr_parts"
@@ -130689,6 +130819,12 @@ member {
   type_id: 0x33756485
   offset: 53376
 }
+member {
+  id: 0xda39f59e
+  name: "nr_redist_regions"
+  type_id: 0xc9082b19
+  offset: 704
+}
 member {
   id: 0xddd1c1b9
   name: "nr_regions"
@@ -135222,6 +135358,12 @@ member {
   name: "ops"
   type_id: 0xbf311330
 }
+member {
+  id: 0xaf511229
+  name: "ops"
+  type_id: 0xda154dec
+  offset: 320
+}
 member {
   id: 0xaf67dd7d
   name: "ops"
@@ -139224,6 +139366,12 @@ member {
   type_id: 0x43bcc470
   offset: 15384
 }
+member {
+  id: 0x220c3d20
+  name: "partition_id"
+  type_id: 0x18bd6530
+  offset: 64
+}
 member {
   id: 0x5669ee49
   name: "partition_setting_completed"
@@ -139296,6 +139444,12 @@ member {
   type_id: 0x914dbfdc
   offset: 32
 }
+member {
+  id: 0x2e76cf6e
+  name: "parts"
+  type_id: 0x117c83ec
+  offset: 64
+}
 member {
   id: 0x22663355
   name: "pasid"
@@ -140443,6 +140597,12 @@ member {
   type_id: 0xd3c80119
   offset: 26240
 }
+member {
+  id: 0xdcf13bd4
+  name: "pend_page"
+  type_id: 0x06835e9c
+  offset: 128
+}
 member {
   id: 0x8109b274
   name: "pendbaser"
@@ -141870,6 +142030,18 @@ member {
   type_id: 0xbdd18903
   offset: 256
 }
+member {
+  id: 0xadafa58d
+  name: "phys_base"
+  type_id: 0xbdd18903
+  offset: 64
+}
+member {
+  id: 0xadafa9a5
+  name: "phys_base"
+  type_id: 0xbdd18903
+  offset: 192
+}
 member {
   id: 0xf07c14d3
   name: "phys_ext_id"
@@ -145208,6 +145380,18 @@ member {
   type_id: 0xee246fac
   offset: 240
 }
+member {
+  id: 0x1bb98a07
+  name: "ppi_descs"
+  type_id: 0x0337b511
+  offset: 896
+}
+member {
+  id: 0xdbd5b2cb
+  name: "ppi_nr"
+  type_id: 0x4585663f
+  offset: 864
+}
 member {
   id: 0xc1f015d6
   name: "ppid"
@@ -148538,6 +148722,18 @@ member {
   type_id: 0x2a670b41
   offset: 5184
 }
+member {
+  id: 0x5b0eeaf9
+  name: "prop_table_pa"
+  type_id: 0xbdd18903
+  offset: 64
+}
+member {
+  id: 0x6e6dd09e
+  name: "prop_table_va"
+  type_id: 0x18bd6530
+  offset: 128
+}
 member {
   id: 0xc4ceb1ab
   name: "prop_vrr_enabled"
@@ -152647,12 +152843,23 @@ member {
   type_id: 0x3922fa08
   offset: 23104
 }
+member {
+  id: 0xc874e707
+  name: "rd_base"
+  type_id: 0x18bd6530
+  offset: 64
+}
 member {
   id: 0xb5b5379c
   name: "rd_iodev"
   type_id: 0x60b9a60c
   offset: 31360
 }
+member {
+  id: 0x5761a9c9
+  name: "rd_lock"
+  type_id: 0xc8b17aa7
+}
 member {
   id: 0x93d4d4a2
   name: "rd_noinc_table"
@@ -152712,6 +152919,17 @@ member {
   type_id: 0x0f78474f
   offset: 960
 }
+member {
+  id: 0x1ac47f21
+  name: "rdist"
+  type_id: 0x09f1b886
+}
+member {
+  id: 0x15ff4b8b
+  name: "rdists"
+  type_id: 0xc58f49ae
+  offset: 192
+}
 member {
   id: 0xdd0dea83
   name: "rdo"
@@ -153972,6 +154190,23 @@ member {
   offset: 29
   bitsize: 1
 }
+member {
+  id: 0xfb0236d4
+  name: "redist_base"
+  type_id: 0x18bd6530
+}
+member {
+  id: 0xe8134608
+  name: "redist_regions"
+  type_id: 0x2054dcff
+  offset: 128
+}
+member {
+  id: 0x0afac9f7
+  name: "redist_stride"
+  type_id: 0x92233392
+  offset: 640
+}
 member {
   id: 0x325a63f3
   name: "redist_vcpu"
@@ -170164,6 +170399,12 @@ member {
   offset: 6497
   bitsize: 1
 }
+member {
+  id: 0x2deb6459
+  name: "single_redist"
+  type_id: 0x6d7f5ff6
+  offset: 128
+}
 member {
   id: 0x219b6ad6
   name: "single_ref"
@@ -195749,6 +195990,12 @@ member {
   type_id: 0x914dbfdc
   offset: 944
 }
+member {
+  id: 0x891a8488
+  name: "vpe_l1_base"
+  type_id: 0x18bd6530
+  offset: 384
+}
 member {
   id: 0xa8c6574f
   name: "vpe_lock"
@@ -195760,6 +196007,12 @@ member {
   name: "vpe_proxy_event"
   type_id: 0x6720d32f
 }
+member {
+  id: 0x1a9ae5dc
+  name: "vpe_table_mask"
+  type_id: 0x0d910d7f
+  offset: 320
+}
 member {
   id: 0xade8e87b
   name: "vpes"
@@ -201133,6 +201386,20 @@ struct_union {
     member_id: 0xfdc1a7ec
   }
 }
+struct_union {
+  id: 0x0d860487
+  kind: STRUCT
+  definition {
+    bytesize: 56
+    member_id: 0x5761a9c9
+    member_id: 0xc874e707
+    member_id: 0xdcf13bd4
+    member_id: 0xadafa9a5
+    member_id: 0x2dfaa7c6
+    member_id: 0x1a9ae5dc
+    member_id: 0x891a8488
+  }
+}
 struct_union {
   id: 0x0dcb7fb1
   kind: STRUCT
@@ -222477,6 +222744,25 @@ struct_union {
     member_id: 0xf0299b61
   }
 }
+struct_union {
+  id: 0x918d6fc0
+  kind: STRUCT
+  name: "gic_chip_data_v3"
+  definition {
+    bytesize: 120
+    member_id: 0x6e4d805e
+    member_id: 0x9afd7b44
+    member_id: 0xe8134608
+    member_id: 0x15ff4b8b
+    member_id: 0xa719db8e
+    member_id: 0x0afac9f7
+    member_id: 0xda39f59e
+    member_id: 0x2dfaafc3
+    member_id: 0x11c79ca4
+    member_id: 0xdbd5b2cb
+    member_id: 0x1bb98a07
+  }
+}
 struct_union {
   id: 0x5395485e
   kind: STRUCT
@@ -236010,6 +236296,30 @@ struct_union {
     member_id: 0xb58d4b20
   }
 }
+struct_union {
+  id: 0x6fb2e92e
+  kind: STRUCT
+  name: "partition_affinity"
+  definition {
+    bytesize: 16
+    member_id: 0xa82f6dfe
+    member_id: 0x220c3d20
+  }
+}
+struct_union {
+  id: 0xb0382dfd
+  kind: STRUCT
+  name: "partition_desc"
+  definition {
+    bytesize: 120
+    member_id: 0x799f8652
+    member_id: 0x2e76cf6e
+    member_id: 0xa719db3e
+    member_id: 0xb465a60b
+    member_id: 0x8941b706
+    member_id: 0xaf511229
+  }
+}
 struct_union {
   id: 0x8e4362ff
   kind: STRUCT
@@ -240135,6 +240445,25 @@ struct_union {
     member_id: 0x9c3a2307
   }
 }
+struct_union {
+  id: 0xc58f49ae
+  kind: STRUCT
+  name: "rdists"
+  definition {
+    bytesize: 48
+    member_id: 0x1ac47f21
+    member_id: 0x5b0eeaf9
+    member_id: 0x6e6dd09e
+    member_id: 0x2dfaafa4
+    member_id: 0x3b2054a4
+    member_id: 0xc50214cc
+    member_id: 0xe9799532
+    member_id: 0xd98bc305
+    member_id: 0xdda2b370
+    member_id: 0x907f5a56
+    member_id: 0x7a9a4a81
+  }
+}
 struct_union {
   id: 0xb72a2600
   kind: STRUCT
@@ -240172,6 +240501,17 @@ struct_union {
     member_id: 0xa83cff72
   }
 }
+struct_union {
+  id: 0xab139560
+  kind: STRUCT
+  name: "redist_region"
+  definition {
+    bytesize: 24
+    member_id: 0xfb0236d4
+    member_id: 0xadafa58d
+    member_id: 0x2deb6459
+  }
+}
 struct_union {
   id: 0xb381c899
   kind: STRUCT
@@ -303690,6 +304030,12 @@ function {
   parameter_id: 0x0483e6f8
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x9b1477ea
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2ef36257
+}
 function {
   id: 0x9b14e220
   return_type_id: 0x6720d32f
@@ -321508,6 +321854,15 @@ elf_symbol {
   type_id: 0x9b342f25
   full_name: "__traceiter_android_vh_get_thermal_zone_device"
 }
+elf_symbol {
+  id: 0x88586647
+  name: "__traceiter_android_vh_gic_v3_suspend"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc672e9e2
+  type_id: 0x9b1477ea
+  full_name: "__traceiter_android_vh_gic_v3_suspend"
+}
 elf_symbol {
   id: 0xdb6662e8
   name: "__traceiter_android_vh_ignore_dmabuf_vmap_bounds"
@@ -324280,6 +324635,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_get_thermal_zone_device"
 }
+elf_symbol {
+  id: 0xf18e312d
+  name: "__tracepoint_android_vh_gic_v3_suspend"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x81031745
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_gic_v3_suspend"
+}
 elf_symbol {
   id: 0xf68497fa
   name: "__tracepoint_android_vh_ignore_dmabuf_vmap_bounds"
@@ -342649,6 +343013,33 @@ elf_symbol {
   type_id: 0x8e47c273
   full_name: "gic_nonsecure_priorities"
 }
+elf_symbol {
+  id: 0x596931c4
+  name: "gic_v3_cpu_init"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe8208812
+  type_id: 0x10985193
+  full_name: "gic_v3_cpu_init"
+}
+elf_symbol {
+  id: 0x390427e4
+  name: "gic_v3_dist_init"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xedec844c
+  type_id: 0x10985193
+  full_name: "gic_v3_dist_init"
+}
+elf_symbol {
+  id: 0x53ba530f
+  name: "gic_v3_dist_wait_for_rwp"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa5c47ee7
+  type_id: 0x10985193
+  full_name: "gic_v3_dist_wait_for_rwp"
+}
 elf_symbol {
   id: 0x365c2930
   name: "glob_match"
@@ -375776,6 +376167,7 @@ interface {
   symbol_id: 0x9fe60f0c
   symbol_id: 0x83b45f32
   symbol_id: 0x1df03151
+  symbol_id: 0x88586647
   symbol_id: 0xdb6662e8
   symbol_id: 0x4b67a5dc
   symbol_id: 0x3684a257
@@ -376084,6 +376476,7 @@ interface {
   symbol_id: 0x828646be
   symbol_id: 0x4756cfec
   symbol_id: 0x8b7beb3b
+  symbol_id: 0xf18e312d
   symbol_id: 0xf68497fa
   symbol_id: 0xbbfc3b7e
   symbol_id: 0xdb161c79
@@ -378124,6 +378517,9 @@ interface {
   symbol_id: 0x62906068
   symbol_id: 0x35ffaad3
   symbol_id: 0x5a582da8
+  symbol_id: 0x596931c4
+  symbol_id: 0x390427e4
+  symbol_id: 0x53ba530f
   symbol_id: 0x365c2930
   symbol_id: 0x64b49555
   symbol_id: 0xbfc46f3e
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index b68554e69e05..1fa9ecb1a0e2 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -1232,6 +1232,9 @@
   gh_rm_notifier_unregister
   gh_rm_register_platform_ops
   gh_rm_unregister_platform_ops
+  gic_v3_cpu_init
+  gic_v3_dist_init
+  gic_v3_dist_wait_for_rwp
   gic_nonsecure_priorities
   gov_attr_set_init
   gov_attr_set_put
@@ -3344,6 +3347,7 @@
   __traceiter_android_vh_ftrace_oops_exit
   __traceiter_android_vh_ftrace_size_check
   __traceiter_android_vh_ignore_dmabuf_vmap_bounds
+  __traceiter_android_vh_gic_v3_suspend
   __traceiter_android_vh_ipi_stop
   __traceiter_android_vh_jiffies_update
   __traceiter_android_vh_kswapd_per_node
@@ -3478,6 +3482,7 @@
   __tracepoint_android_vh_ftrace_oops_exit
   __tracepoint_android_vh_ftrace_size_check
   __tracepoint_android_vh_ignore_dmabuf_vmap_bounds
+  __tracepoint_android_vh_gic_v3_suspend
   __tracepoint_android_vh_ipi_stop
   __tracepoint_android_vh_jiffies_update
   __tracepoint_android_vh_kswapd_per_node