diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 6e070ff4db69..41f0eecb2f04 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -11321,6 +11321,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xa3652854
 }
+pointer_reference {
+  id: 0x22561ecb
+  kind: POINTER
+  pointee_type_id: 0xa3189db3
+}
 pointer_reference {
   id: 0x2259084f
   kind: POINTER
@@ -11356,6 +11361,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xa3adbe6c
 }
+pointer_reference {
+  id: 0x228954ca
+  kind: POINTER
+  pointee_type_id: 0xa065b5b5
+}
 pointer_reference {
   id: 0x228d1fdb
   kind: POINTER
@@ -163970,6 +163980,11 @@ member {
   type_id: 0x18bd6530
   offset: 256
 }
+member {
+  id: 0xd440bc7f
+  name: "sbq"
+  type_id: 0x12e24ee1
+}
 member {
   id: 0x693c7182
   name: "sbrn"
@@ -195584,6 +195599,12 @@ member {
   type_id: 0x347ff86e
   offset: 192
 }
+member {
+  id: 0x201ba432
+  name: "wait"
+  type_id: 0x35a67227
+  offset: 64
+}
 member {
   id: 0x201ba81a
   name: "wait"
@@ -241008,6 +241029,16 @@ struct_union {
     member_id: 0xf225f799
   }
 }
+struct_union {
+  id: 0xa065b5b5
+  kind: STRUCT
+  name: "sbq_wait"
+  definition {
+    bytesize: 48
+    member_id: 0xd440bc7f
+    member_id: 0x201ba432
+  }
+}
 struct_union {
   id: 0x2c37cb88
   kind: STRUCT
@@ -278962,6 +278993,13 @@ function {
   parameter_id: 0x1d19a9d5
   parameter_id: 0xfc0e1dbd
 }
+function {
+  id: 0x142e1753
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x019dcb45
+  parameter_id: 0x228954ca
+}
 function {
   id: 0x142e3633
   return_type_id: 0x48b5725f
@@ -278973,6 +279011,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x1285100d
 }
+function {
+  id: 0x143955b1
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x0665e6b6
+}
 function {
   id: 0x1439657e
   return_type_id: 0x48b5725f
@@ -279578,6 +279622,13 @@ function {
   return_type_id: 0x33756485
   parameter_id: 0x92233392
 }
+function {
+  id: 0x1527b6ea
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x4585663f
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x152d3031
   return_type_id: 0x48b5725f
@@ -281449,6 +281500,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x22cee855
 }
+function {
+  id: 0x183a04a1
+  return_type_id: 0x48b5725f
+  parameter_id: 0x228954ca
+}
 function {
   id: 0x184069d1
   return_type_id: 0x48b5725f
@@ -282156,6 +282212,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x24d8c7ab
 }
+function {
+  id: 0x19af92ca
+  return_type_id: 0x48b5725f
+  parameter_id: 0x2208f89a
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x19b6a09f
   return_type_id: 0x48b5725f
@@ -296798,6 +296860,17 @@ function {
   parameter_id: 0x25b73daa
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x941967cc
+  return_type_id: 0x6720d32f
+  parameter_id: 0x22561ecb
+  parameter_id: 0x4585663f
+  parameter_id: 0x6720d32f
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x941d79a6
   return_type_id: 0x6720d32f
@@ -299645,6 +299718,16 @@ function {
   parameter_id: 0x33756485
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x98362533
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x4585663f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9837b2b4
   return_type_id: 0x6720d32f
@@ -300809,6 +300892,11 @@ function {
   parameter_id: 0x104d069a
   parameter_id: 0x295c7202
 }
+function {
+  id: 0x99387097
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12e24ee1
+}
 function {
   id: 0x9939118b
   return_type_id: 0x6720d32f
@@ -315208,6 +315296,12 @@ function {
   return_type_id: 0x6d7f5ff6
   parameter_id: 0x3c2755a3
 }
+function {
+  id: 0xf1ae1eac
+  return_type_id: 0x3e6239e1
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x27a7c613
+}
 function {
   id: 0xf1b060ff
   return_type_id: 0x6d7f5ff6
@@ -315498,6 +315592,11 @@ function {
   parameter_id: 0x0ee13889
   parameter_id: 0x358ff5b7
 }
+function {
+  id: 0xf34d29c1
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x37a5cb14
+}
 function {
   id: 0xf354bbbc
   return_type_id: 0x26e55184
@@ -315932,6 +316031,13 @@ function {
   parameter_id: 0x188b9e81
   parameter_id: 0x3ea31487
 }
+function {
+  id: 0xf87e0015
+  return_type_id: 0x3e6239e1
+  parameter_id: 0x18bd6530
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x0379c823
+}
 function {
   id: 0xf87eb23d
   return_type_id: 0x6d7f5ff6
@@ -316147,6 +316253,14 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x4585663f
 }
+function {
+  id: 0xfc093226
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x09427c40
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x15a30023
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xfc2e3179
   return_type_id: 0x6d7f5ff6
@@ -319161,6 +319275,15 @@ elf_symbol {
   type_id: 0x1dbb54c5
   full_name: "__rt_mutex_init"
 }
+elf_symbol {
+  id: 0x99aa632e
+  name: "__sbitmap_queue_get"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0a991166
+  type_id: 0x99387097
+  full_name: "__sbitmap_queue_get"
+}
 elf_symbol {
   id: 0xe68925b8
   name: "__scsi_add_device"
@@ -327781,6 +327904,15 @@ elf_symbol {
   type_id: 0x1738d1f7
   full_name: "blk_abort_request"
 }
+elf_symbol {
+  id: 0x1516f6b7
+  name: "blk_bio_list_merge"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x693f756e
+  type_id: 0xfc093226
+  full_name: "blk_bio_list_merge"
+}
 elf_symbol {
   id: 0x4ffac461
   name: "blk_crypto_keyslot_index"
@@ -327871,6 +328003,15 @@ elf_symbol {
   type_id: 0x1738d1f7
   full_name: "blk_mq_complete_request"
 }
+elf_symbol {
+  id: 0x0467bac1
+  name: "blk_mq_debugfs_rq_show"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xec127399
+  type_id: 0x9c7b6f16
+  full_name: "blk_mq_debugfs_rq_show"
+}
 elf_symbol {
   id: 0x6458d26a
   name: "blk_mq_destroy_queue"
@@ -327970,6 +328111,15 @@ elf_symbol {
   type_id: 0xc97bfe9f
   full_name: "blk_mq_rq_cpu"
 }
+elf_symbol {
+  id: 0xff90ba37
+  name: "blk_mq_run_hw_queue"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x46c2c44f
+  type_id: 0x19af92ca
+  full_name: "blk_mq_run_hw_queue"
+}
 elf_symbol {
   id: 0xff19eaec
   name: "blk_mq_run_hw_queues"
@@ -361931,6 +362081,60 @@ elf_symbol {
   type_id: 0x1192ec84
   full_name: "sb800_prefetch"
 }
+elf_symbol {
+  id: 0x806f167c
+  name: "sbitmap_add_wait_queue"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4981b0e2
+  type_id: 0x142e1753
+  full_name: "sbitmap_add_wait_queue"
+}
+elf_symbol {
+  id: 0xf13ba64e
+  name: "sbitmap_any_bit_set"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x499f6a97
+  type_id: 0xf34d29c1
+  full_name: "sbitmap_any_bit_set"
+}
+elf_symbol {
+  id: 0xe4f77cb7
+  name: "sbitmap_del_wait_queue"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfab6c92b
+  type_id: 0x183a04a1
+  full_name: "sbitmap_del_wait_queue"
+}
+elf_symbol {
+  id: 0x12f98f54
+  name: "sbitmap_init_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8be9a5cf
+  type_id: 0x941967cc
+  full_name: "sbitmap_init_node"
+}
+elf_symbol {
+  id: 0x85d0ffae
+  name: "sbitmap_queue_clear"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xcfb42d08
+  type_id: 0x1527b6ea
+  full_name: "sbitmap_queue_clear"
+}
+elf_symbol {
+  id: 0xe160a711
+  name: "sbitmap_queue_init_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe4bd68f7
+  type_id: 0x98362533
+  full_name: "sbitmap_queue_init_node"
+}
 elf_symbol {
   id: 0x4513114c
   name: "sbitmap_queue_min_shallow_depth"
@@ -361940,6 +362144,24 @@ elf_symbol {
   type_id: 0x1536d7b3
   full_name: "sbitmap_queue_min_shallow_depth"
 }
+elf_symbol {
+  id: 0x3af97828
+  name: "sbitmap_queue_resize"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x67a07059
+  type_id: 0x1536d7b3
+  full_name: "sbitmap_queue_resize"
+}
+elf_symbol {
+  id: 0x6375c31d
+  name: "sbitmap_queue_show"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xee37b200
+  type_id: 0x143955b1
+  full_name: "sbitmap_queue_show"
+}
 elf_symbol {
   id: 0x56cb7a36
   name: "sbitmap_weight"
@@ -362993,6 +363215,24 @@ elf_symbol {
   type_id: 0x42749d40
   full_name: "seq_hlist_start_head"
 }
+elf_symbol {
+  id: 0xe5f1a4c5
+  name: "seq_list_next"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe7d4daac
+  type_id: 0xf87e0015
+  full_name: "seq_list_next"
+}
+elf_symbol {
+  id: 0x1405c2fb
+  name: "seq_list_start"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xff1e9dd8
+  type_id: 0xf1ae1eac
+  full_name: "seq_list_start"
+}
 elf_symbol {
   id: 0xe0349007
   name: "seq_lseek"
@@ -368523,6 +368763,15 @@ elf_symbol {
   type_id: 0x90e86d28
   full_name: "timer_of_init"
 }
+elf_symbol {
+  id: 0x5da495c5
+  name: "timer_reduce"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x75c21753
+  type_id: 0x92c0b65c
+  full_name: "timer_reduce"
+}
 elf_symbol {
   id: 0xdc3e523b
   name: "timer_unstable_counter_workaround"
@@ -377120,6 +377369,7 @@ interface {
   symbol_id: 0x2b453adc
   symbol_id: 0xd5276fa4
   symbol_id: 0x98379aaf
+  symbol_id: 0x99aa632e
   symbol_id: 0xe68925b8
   symbol_id: 0x6e3bb1cf
   symbol_id: 0x0166be18
@@ -378078,6 +378328,7 @@ interface {
   symbol_id: 0xb5b2d835
   symbol_id: 0x226328f4
   symbol_id: 0x0b5d5f1c
+  symbol_id: 0x1516f6b7
   symbol_id: 0x4ffac461
   symbol_id: 0xad8bab96
   symbol_id: 0x528ef002
@@ -378088,6 +378339,7 @@ interface {
   symbol_id: 0x0d1fc920
   symbol_id: 0xd34c6466
   symbol_id: 0x51c471d6
+  symbol_id: 0x0467bac1
   symbol_id: 0x6458d26a
   symbol_id: 0x2e876bee
   symbol_id: 0x1996f188
@@ -378099,6 +378351,7 @@ interface {
   symbol_id: 0x1f81c0c0
   symbol_id: 0xcebb0cec
   symbol_id: 0x27ae2b17
+  symbol_id: 0xff90ba37
   symbol_id: 0xff19eaec
   symbol_id: 0x49ee3f1e
   symbol_id: 0x646a1dc6
@@ -381871,7 +382124,15 @@ interface {
   symbol_id: 0x8fb082a6
   symbol_id: 0x570df167
   symbol_id: 0x84f045c2
+  symbol_id: 0x806f167c
+  symbol_id: 0xf13ba64e
+  symbol_id: 0xe4f77cb7
+  symbol_id: 0x12f98f54
+  symbol_id: 0x85d0ffae
+  symbol_id: 0xe160a711
   symbol_id: 0x4513114c
+  symbol_id: 0x3af97828
+  symbol_id: 0x6375c31d
   symbol_id: 0x56cb7a36
   symbol_id: 0xe8c754b0
   symbol_id: 0x12fb2fd6
@@ -381989,6 +382250,8 @@ interface {
   symbol_id: 0xb2b0c8fa
   symbol_id: 0xfb710d3e
   symbol_id: 0x0af60b8b
+  symbol_id: 0xe5f1a4c5
+  symbol_id: 0x1405c2fb
   symbol_id: 0xe0349007
   symbol_id: 0xfae0b182
   symbol_id: 0x9ef87854
@@ -382604,6 +382867,7 @@ interface {
   symbol_id: 0x6642e9e1
   symbol_id: 0x4063e8a2
   symbol_id: 0x78e97bdd
+  symbol_id: 0x5da495c5
   symbol_id: 0xdc3e523b
   symbol_id: 0x3934d205
   symbol_id: 0xa603e7df
diff --git a/android/abi_gki_aarch64_vivo b/android/abi_gki_aarch64_vivo
index 934892f00111..69d634eb4fa5 100644
--- a/android/abi_gki_aarch64_vivo
+++ b/android/abi_gki_aarch64_vivo
@@ -164,6 +164,7 @@
   __kfifo_to_user
   __kfifo_to_user_r
   __kmalloc
+  __kmalloc_node
   __kmalloc_node_track_caller
   __kthread_init_worker
   __list_add_valid
@@ -240,6 +241,7 @@
   __reset_control_get
   __rht_bucket_nested
   __rt_mutex_init
+  __sbitmap_queue_get
   __scsi_add_device
   __scsi_iterate_devices
   __scsi_print_sense
@@ -430,6 +432,7 @@
   __traceiter_android_vh_update_topology_flags_workfn
   __traceiter_android_vh_watchdog_timer_softlockup
   __traceiter_binder_transaction_received
+  __traceiter_block_rq_insert
   __traceiter_clock_set_rate
   __traceiter_console
   __traceiter_cpu_frequency_limits
@@ -598,6 +601,7 @@
   __tracepoint_android_vh_update_topology_flags_workfn
   __tracepoint_android_vh_watchdog_timer_softlockup
   __tracepoint_binder_transaction_received
+  __tracepoint_block_rq_insert
   __tracepoint_clock_set_rate
   __tracepoint_console
   __tracepoint_cpu_frequency_limits
@@ -798,12 +802,14 @@
   bitmap_release_region
   bitmap_to_arr32
   bitmap_zalloc
+  blk_bio_list_merge
   blk_execute_rq
   blk_execute_rq_nowait
   blk_mq_alloc_request
   blk_mq_alloc_sq_tag_set
   blk_mq_alloc_tag_set
   blk_mq_complete_request
+  blk_mq_debugfs_rq_show
   blk_mq_end_request
   blk_mq_end_request_batch
   blk_mq_free_request
@@ -814,6 +820,7 @@
   blk_mq_quiesce_queue
   blk_mq_requeue_request
   blk_mq_rq_cpu
+  blk_mq_run_hw_queue
   blk_mq_start_request
   blk_mq_start_stopped_hw_queues
   blk_mq_stop_hw_queue
@@ -843,6 +850,8 @@
   blk_rq_map_user_io
   blk_rq_map_user_iov
   blk_rq_unmap_user
+  blk_stat_disable_accounting
+  blk_stat_enable_accounting
   blk_status_to_errno
   blk_update_request
   blkdev_get_by_dev
@@ -1986,6 +1995,9 @@
   edac_device_free_ctl_info
   edac_device_handle_ce_count
   edac_device_handle_ue_count
+  elv_register
+  elv_unregister
+  elevator_alloc
   em_cpu_get
   emergency_restart
   enable_irq
@@ -3832,6 +3844,15 @@
   safe_candev_priv
   sampling_rate_store
   sb800_prefetch
+  sbitmap_add_wait_queue
+  sbitmap_any_bit_set
+  sbitmap_del_wait_queue
+  sbitmap_init_node
+  sbitmap_queue_clear
+  sbitmap_queue_init_node
+  sbitmap_queue_min_shallow_depth
+  sbitmap_queue_resize
+  sbitmap_queue_show
   scatterwalk_ffwd
   scatterwalk_map_and_copy
   sched_clock
@@ -3924,6 +3945,8 @@
   seq_hex_dump
   seq_hlist_next
   seq_hlist_start_head
+  seq_list_next
+  seq_list_start
   seq_lseek
   seq_open
   seq_printf
@@ -4419,6 +4442,7 @@
   timecounter_cyc2time
   timecounter_init
   timecounter_read
+  timer_reduce
   timer_unstable_counter_workaround
   timespec64_to_jiffies
   tipc_dump_done