diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index f3588814586a..c321dfae30ca 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -11368,6 +11368,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x54a91269
 }
+pointer_reference {
+  id: 0x1fbeff3e
+  kind: POINTER
+  pointee_type_id: 0x54bb1a65
+}
 pointer_reference {
   id: 0x1fc1dca8
   kind: POINTER
@@ -297074,6 +297079,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x1fba7d3d
 }
+function {
+  id: 0x1777ee5c
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1fbeff3e
+}
 function {
   id: 0x177cb160
   return_type_id: 0x48b5725f
@@ -323449,6 +323459,14 @@ function {
   parameter_id: 0x18150d9f
   parameter_id: 0x06b96242
 }
+function {
+  id: 0x9ba060b9
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x00be4281
+  parameter_id: 0x3593bec8
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9ba0658b
   return_type_id: 0x6720d32f
@@ -336049,6 +336067,11 @@ function {
   parameter_id: 0x18019702
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0xf94be4cb
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x1fbeff3e
+}
 function {
   id: 0xf9525760
   return_type_id: 0x6d7f5ff6
@@ -343008,6 +343031,15 @@ elf_symbol {
   type_id: 0x9ba93092
   full_name: "__traceiter_android_vh_rwsem_can_spin_on_owner"
 }
+elf_symbol {
+  id: 0xaa42999f
+  name: "__traceiter_android_vh_rwsem_direct_rsteal"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf066f9e5
+  type_id: 0x9ba93092
+  full_name: "__traceiter_android_vh_rwsem_direct_rsteal"
+}
 elf_symbol {
   id: 0xb1847a6f
   name: "__traceiter_android_vh_rwsem_init"
@@ -343035,6 +343067,15 @@ elf_symbol {
   type_id: 0x9ba966ad
   full_name: "__traceiter_android_vh_rwsem_opt_spin_start"
 }
+elf_symbol {
+  id: 0x66c7c5f3
+  name: "__traceiter_android_vh_rwsem_optimistic_rspin"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd12e2760
+  type_id: 0x9ba060b9
+  full_name: "__traceiter_android_vh_rwsem_optimistic_rspin"
+}
 elf_symbol {
   id: 0xbffefc2b
   name: "__traceiter_android_vh_rwsem_read_wait_finish"
@@ -347256,6 +347297,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rwsem_can_spin_on_owner"
 }
+elf_symbol {
+  id: 0x403cf0dd
+  name: "__tracepoint_android_vh_rwsem_direct_rsteal"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xd7439dcb
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_direct_rsteal"
+}
 elf_symbol {
   id: 0x84628825
   name: "__tracepoint_android_vh_rwsem_init"
@@ -347283,6 +347333,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rwsem_opt_spin_start"
 }
+elf_symbol {
+  id: 0x8866a3b9
+  name: "__tracepoint_android_vh_rwsem_optimistic_rspin"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x89c242e2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_optimistic_rspin"
+}
 elf_symbol {
   id: 0xe7ef7059
   name: "__tracepoint_android_vh_rwsem_read_wait_finish"
@@ -381277,6 +381336,24 @@ elf_symbol {
   type_id: 0x0bc7866e
   full_name: "orderly_poweroff"
 }
+elf_symbol {
+  id: 0x33abdf76
+  name: "osq_lock"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1f8df714
+  type_id: 0xf94be4cb
+  full_name: "osq_lock"
+}
+elf_symbol {
+  id: 0x2ffaca4e
+  name: "osq_unlock"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa1d5320d
+  type_id: 0x1777ee5c
+  full_name: "osq_unlock"
+}
 elf_symbol {
   id: 0x57ecab02
   name: "out_of_line_wait_on_bit"
@@ -407150,9 +407227,11 @@ interface {
   symbol_id: 0xfb1b8d64
   symbol_id: 0xc56d7179
   symbol_id: 0x5858f827
+  symbol_id: 0xaa42999f
   symbol_id: 0xb1847a6f
   symbol_id: 0x958d8cdb
   symbol_id: 0xfde8086a
+  symbol_id: 0x66c7c5f3
   symbol_id: 0xbffefc2b
   symbol_id: 0x3d83999a
   symbol_id: 0xf7bca936
@@ -407622,9 +407701,11 @@ interface {
   symbol_id: 0xf01f02ea
   symbol_id: 0xeaebbadf
   symbol_id: 0xe471b8d5
+  symbol_id: 0x403cf0dd
   symbol_id: 0x84628825
   symbol_id: 0x8d0ce77d
   symbol_id: 0x50ab483c
+  symbol_id: 0x8866a3b9
   symbol_id: 0xe7ef7059
   symbol_id: 0xf2d006c8
   symbol_id: 0x85a885d0
@@ -411401,6 +411482,8 @@ interface {
   symbol_id: 0xa50d59b7
   symbol_id: 0x224cb6b2
   symbol_id: 0x67bce5b1
+  symbol_id: 0x33abdf76
+  symbol_id: 0x2ffaca4e
   symbol_id: 0x57ecab02
   symbol_id: 0x27d0c7b6
   symbol_id: 0x3d8c84e9
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 2205fef8484e..9818f1f154b7 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -63,6 +63,8 @@
   nf_unregister_net_hooks
   nr_running
   of_css
+  osq_lock
+  osq_unlock
   __page_file_index
   __page_mapcount
   pm_get_active_wakeup_sources
@@ -169,6 +171,8 @@
   __traceiter_android_vh_rtmutex_waiter_prio
   __traceiter_android_vh_rt_mutex_steal
   __traceiter_android_vh_rwsem_can_spin_on_owner
+  __traceiter_android_vh_rwsem_direct_rsteal
+  __traceiter_android_vh_rwsem_optimistic_rspin
   __traceiter_android_vh_rwsem_opt_spin_finish
   __traceiter_android_vh_rwsem_opt_spin_start
   __traceiter_android_vh_rwsem_wake_finish
@@ -278,6 +282,8 @@
   __tracepoint_android_vh_rtmutex_waiter_prio
   __tracepoint_android_vh_rt_mutex_steal
   __tracepoint_android_vh_rwsem_can_spin_on_owner
+  __tracepoint_android_vh_rwsem_direct_rsteal
+  __tracepoint_android_vh_rwsem_optimistic_rspin
   __tracepoint_android_vh_rwsem_opt_spin_finish
   __tracepoint_android_vh_rwsem_opt_spin_start
   __tracepoint_android_vh_rwsem_wake_finish