diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index f56785cb19f4..e7dadf51f7e4 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -304029,6 +304029,14 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x1b8590a8
 }
+function {
+  id: 0x9b63bb96
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x33756485
+  parameter_id: 0x064d6086
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9b64054e
   return_type_id: 0x6720d32f
@@ -320348,6 +320356,15 @@ elf_symbol {
   type_id: 0x9bcd4ff7
   full_name: "__traceiter_android_vh_check_uninterrupt_tasks_done"
 }
+elf_symbol {
+  id: 0xef7737f8
+  name: "__traceiter_android_vh_cleanup_old_buffers_bypass"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x221ef9d7
+  type_id: 0x9b63bb96
+  full_name: "__traceiter_android_vh_cleanup_old_buffers_bypass"
+}
 elf_symbol {
   id: 0x9247dcb1
   name: "__traceiter_android_vh_cpu_idle_enter"
@@ -320429,6 +320446,15 @@ elf_symbol {
   type_id: 0x9bb8e3d1
   full_name: "__traceiter_android_vh_disable_thermal_cooling_stats"
 }
+elf_symbol {
+  id: 0x5c382938
+  name: "__traceiter_android_vh_dm_bufio_shrink_scan_bypass"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x7be804c5
+  type_id: 0x9b661c0a
+  full_name: "__traceiter_android_vh_dm_bufio_shrink_scan_bypass"
+}
 elf_symbol {
   id: 0xd593b3ef
   name: "__traceiter_android_vh_do_futex"
@@ -322904,6 +322930,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_check_uninterrupt_tasks_done"
 }
+elf_symbol {
+  id: 0xca10f06e
+  name: "__tracepoint_android_vh_cleanup_old_buffers_bypass"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x2ace59c2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_cleanup_old_buffers_bypass"
+}
 elf_symbol {
   id: 0x26324a1f
   name: "__tracepoint_android_vh_cpu_idle_enter"
@@ -322985,6 +323020,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_disable_thermal_cooling_stats"
 }
+elf_symbol {
+  id: 0x0ae2ee16
+  name: "__tracepoint_android_vh_dm_bufio_shrink_scan_bypass"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x1e1422af
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_dm_bufio_shrink_scan_bypass"
+}
 elf_symbol {
   id: 0x9fe99d05
   name: "__tracepoint_android_vh_do_futex"
@@ -374097,6 +374141,7 @@ interface {
   symbol_id: 0x42428033
   symbol_id: 0x005c7625
   symbol_id: 0xf3accb84
+  symbol_id: 0xef7737f8
   symbol_id: 0x9247dcb1
   symbol_id: 0xfd04e27a
   symbol_id: 0xa124d3e0
@@ -374106,6 +374151,7 @@ interface {
   symbol_id: 0x431c5bf5
   symbol_id: 0x9f47ed94
   symbol_id: 0x0bf2f5bb
+  symbol_id: 0x5c382938
   symbol_id: 0xd593b3ef
   symbol_id: 0x1cc3aec5
   symbol_id: 0xb12728da
@@ -374381,6 +374427,7 @@ interface {
   symbol_id: 0x9620eac1
   symbol_id: 0x5cc4ca5b
   symbol_id: 0x607a7f0a
+  symbol_id: 0xca10f06e
   symbol_id: 0x26324a1f
   symbol_id: 0x4ade2774
   symbol_id: 0x704b9aae
@@ -374390,6 +374437,7 @@ interface {
   symbol_id: 0x66a766d7
   symbol_id: 0xc44d61e6
   symbol_id: 0x1ddb60ad
+  symbol_id: 0x0ae2ee16
   symbol_id: 0x9fe99d05
   symbol_id: 0x82ce823f
   symbol_id: 0x474d211c
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 01bfda84e728..e6e0f9ec932f 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -109,6 +109,8 @@
   __traceiter_android_vh_mutex_opt_spin_finish
   __traceiter_android_vh_mutex_opt_spin_start
   __traceiter_android_vh_cpufreq_acct_update_power  
+  __traceiter_android_vh_cleanup_old_buffers_bypass
+  __traceiter_android_vh_dm_bufio_shrink_scan_bypass
   __traceiter_android_vh_mutex_unlock_slowpath
   __traceiter_android_vh_rwsem_can_spin_on_owner
   __traceiter_android_vh_rwsem_opt_spin_finish
@@ -150,6 +152,8 @@
   __tracepoint_android_vh_mutex_opt_spin_finish
   __tracepoint_android_vh_mutex_opt_spin_start
   __tracepoint_android_vh_cpufreq_acct_update_power
+  __tracepoint_android_vh_cleanup_old_buffers_bypass
+  __tracepoint_android_vh_dm_bufio_shrink_scan_bypass
   __tracepoint_android_vh_mutex_unlock_slowpath
   __tracepoint_android_vh_rwsem_can_spin_on_owner
   __tracepoint_android_vh_rwsem_opt_spin_finish