diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 82b70882a88f..98c71fca24b3 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -361817,15 +361817,6 @@ elf_symbol {
   type_id: 0x9bf1212e
   full_name: "__traceiter_android_vh_filemap_add_folio"
 }
-elf_symbol {
-  id: 0xc7eb0294
-  name: "__traceiter_android_vh_filemap_fault_before_folio_locked"
-  is_defined: true
-  symbol_type: FUNCTION
-  crc: 0x340bbb05
-  type_id: 0x9b2a7922
-  full_name: "__traceiter_android_vh_filemap_fault_before_folio_locked"
-}
 elf_symbol {
   id: 0x19fc04e0
   name: "__traceiter_android_vh_filemap_fault_end"
@@ -361835,6 +361826,15 @@ elf_symbol {
   type_id: 0x9bc0ce91
   full_name: "__traceiter_android_vh_filemap_fault_end"
 }
+elf_symbol {
+  id: 0x980c4b2d
+  name: "__traceiter_android_vh_filemap_fault_pre_folio_locked"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x907ba169
+  type_id: 0x9b2a7922
+  full_name: "__traceiter_android_vh_filemap_fault_pre_folio_locked"
+}
 elf_symbol {
   id: 0x734973d4
   name: "__traceiter_android_vh_filemap_fault_start"
@@ -368882,15 +368882,6 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_filemap_add_folio"
 }
-elf_symbol {
-  id: 0x22175e02
-  name: "__tracepoint_android_vh_filemap_fault_before_folio_locked"
-  is_defined: true
-  symbol_type: OBJECT
-  crc: 0x39b39bbc
-  type_id: 0x18ccbd2c
-  full_name: "__tracepoint_android_vh_filemap_fault_before_folio_locked"
-}
 elf_symbol {
   id: 0x197d6be2
   name: "__tracepoint_android_vh_filemap_fault_end"
@@ -368900,6 +368891,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_filemap_fault_end"
 }
+elf_symbol {
+  id: 0xf045a23f
+  name: "__tracepoint_android_vh_filemap_fault_pre_folio_locked"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xabdab21f
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_filemap_fault_pre_folio_locked"
+}
 elf_symbol {
   id: 0xdac9a862
   name: "__tracepoint_android_vh_filemap_fault_start"
@@ -436277,8 +436277,8 @@ interface {
   symbol_id: 0x905272e6
   symbol_id: 0x93a4717b
   symbol_id: 0x6091a763
-  symbol_id: 0xc7eb0294
   symbol_id: 0x19fc04e0
+  symbol_id: 0x980c4b2d
   symbol_id: 0x734973d4
   symbol_id: 0xddad3a11
   symbol_id: 0x49c69e22
@@ -437062,8 +437062,8 @@ interface {
   symbol_id: 0xbf5d713c
   symbol_id: 0x50a83025
   symbol_id: 0x0c03d499
-  symbol_id: 0x22175e02
   symbol_id: 0x197d6be2
+  symbol_id: 0xf045a23f
   symbol_id: 0xdac9a862
   symbol_id: 0x9eaf9eab
   symbol_id: 0x6d970e8c
diff --git a/android/abi_gki_aarch64.stg.allowed_breaks b/android/abi_gki_aarch64.stg.allowed_breaks
index 08bf02f747be..7fd3832d7e2c 100644
--- a/android/abi_gki_aarch64.stg.allowed_breaks
+++ b/android/abi_gki_aarch64.stg.allowed_breaks
@@ -126,3 +126,9 @@ type 'struct io_ring_ctx' changed
   28 members ('struct wait_queue_head poll_wq' .. 'struct page** sqe_pages') changed
     offset changed by -64
 
+1 function symbol(s) removed
+  'int __traceiter_android_vh_filemap_fault_before_folio_locked(void*, struct folio*)'
+
+1 variable symbol(s) removed
+  'struct tracepoint __tracepoint_android_vh_filemap_fault_before_folio_locked'
+
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 2797e2390fe8..219baa63c2ff 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -333,7 +333,7 @@
   __traceiter_android_vh_update_unmapped_area_info
   __traceiter_android_vh_reuse_whole_anon_folio
   __tracepoint_android_vh_folio_add_lru_folio_activate
-  __tracepoint_android_vh_filemap_fault_before_folio_locked
+  __tracepoint_android_vh_filemap_fault_pre_folio_locked
   __tracepoint_android_vh_filemap_folio_mapped
   __tracepoint_android_vh_folio_remove_rmap_ptes
   __traceiter_block_bio_queue
@@ -502,7 +502,7 @@
   __tracepoint_android_vh_update_unmapped_area_info
   __tracepoint_android_vh_reuse_whole_anon_folio
   __traceiter_android_vh_folio_add_lru_folio_activate
-  __traceiter_android_vh_filemap_fault_before_folio_locked
+  __traceiter_android_vh_filemap_fault_pre_folio_locked
   __traceiter_android_vh_filemap_folio_mapped
   __traceiter_android_vh_folio_remove_rmap_ptes
   __tracepoint_block_bio_queue