diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 36d2db93a951..abe45e7be2f8 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -427,6 +427,7 @@
+
@@ -480,6 +481,7 @@
+
@@ -5760,6 +5762,7 @@
+
@@ -5826,6 +5829,7 @@
+
@@ -7331,7 +7335,7 @@
-
+
@@ -23490,42 +23494,42 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -33021,60 +33025,60 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -39018,7 +39022,7 @@
-
+
@@ -49679,18 +49683,18 @@
-
+
-
+
-
+
-
+
-
+
@@ -56232,390 +56236,390 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -65840,7 +65844,7 @@
-
+
@@ -74359,15 +74363,15 @@
-
+
-
+
-
+
-
+
@@ -97315,46 +97319,46 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -115584,6 +115588,12 @@
+
+
+
+
+
+
@@ -115900,6 +115910,14 @@
+
+
+
+
+
+
+
+
@@ -116538,6 +116556,7 @@
+
@@ -116604,6 +116623,7 @@
+
@@ -125192,10 +125212,10 @@
-
-
-
-
+
+
+
+
diff --git a/android/abi_gki_aarch64_vivo b/android/abi_gki_aarch64_vivo
index 00d7caaae715..93e96eddb122 100644
--- a/android/abi_gki_aarch64_vivo
+++ b/android/abi_gki_aarch64_vivo
@@ -1721,6 +1721,7 @@
__traceiter_android_vh_iommu_setup_dma_ops
__traceiter_android_vh_ipi_stop
__traceiter_android_vh_jiffies_update
+ __traceiter_android_vh_mmap_region
__traceiter_android_vh_mmc_attach_sd
__traceiter_android_vh_mmc_blk_mq_rw_recovery
__traceiter_android_vh_mmc_blk_reset
@@ -1733,6 +1734,7 @@
__traceiter_android_vh_show_resume_epoch_val
__traceiter_android_vh_show_suspend_epoch_val
__traceiter_android_vh_timer_calc_index
+ __traceiter_android_vh_try_to_unmap_one
__traceiter_android_vh_ufs_check_int_errors
__traceiter_android_vh_ufs_compl_command
__traceiter_android_vh_ufs_send_command
@@ -1813,6 +1815,7 @@
__tracepoint_android_vh_ipi_stop
__tracepoint_android_vh_irqtime_account_process_tick
__tracepoint_android_vh_jiffies_update
+ __tracepoint_android_vh_mmap_region
__tracepoint_android_vh_mmc_attach_sd
__tracepoint_android_vh_mmc_blk_mq_rw_recovery
__tracepoint_android_vh_mmc_blk_reset
@@ -1825,6 +1828,7 @@
__tracepoint_android_vh_show_resume_epoch_val
__tracepoint_android_vh_show_suspend_epoch_val
__tracepoint_android_vh_timer_calc_index
+ __tracepoint_android_vh_try_to_unmap_one
__tracepoint_android_vh_tune_scan_type
__tracepoint_android_vh_tune_swappiness
__tracepoint_android_vh_ufs_check_int_errors