diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index fbbcdb424bf5..393e96a0357f 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -502,6 +502,7 @@
+
@@ -518,6 +519,11 @@
+
+
+
+
+
@@ -6292,6 +6298,7 @@
+
@@ -6313,8 +6320,13 @@
+
+
+
+
+
@@ -15002,24 +15014,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -17641,102 +17653,102 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -47037,36 +47049,36 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -48380,12 +48392,12 @@
-
+
-
+
-
+
@@ -52968,12 +52980,12 @@
-
+
-
+
-
+
@@ -59829,9 +59841,9 @@
-
+
-
+
@@ -65484,33 +65496,33 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -74354,21 +74366,21 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -76231,120 +76243,120 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -76905,18 +76917,18 @@
-
+
-
+
-
+
-
+
-
+
@@ -85042,12 +85054,12 @@
-
+
-
+
-
+
@@ -92024,7 +92036,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93269,9 +93294,9 @@
-
+
-
+
@@ -99981,12 +100006,12 @@
-
+
-
+
-
+
@@ -103584,21 +103609,21 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -105607,66 +105632,66 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -106757,7 +106782,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -116490,10 +116543,10 @@
-
-
-
-
+
+
+
+
@@ -117893,6 +117946,12 @@
+
+
+
+
+
+
@@ -117992,6 +118051,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -119018,6 +119103,7 @@
+
@@ -119039,8 +119125,13 @@
+
+
+
+
+
@@ -121357,26 +121448,26 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -122765,14 +122856,14 @@
-
-
-
+
+
+
-
-
-
+
+
+
@@ -128182,10 +128273,10 @@
-
-
-
-
+
+
+
+
@@ -128668,8 +128759,8 @@
-
-
+
+
@@ -128696,9 +128787,9 @@
-
-
-
+
+
+
@@ -128709,8 +128800,8 @@
-
-
+
+
@@ -128722,8 +128813,8 @@
-
-
+
+
@@ -129668,9 +129759,9 @@
-
-
-
+
+
+
@@ -129702,17 +129793,17 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
@@ -131165,7 +131256,7 @@
-
+
@@ -131501,19 +131592,19 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
@@ -131546,17 +131637,17 @@
-
-
+
+
-
-
-
+
+
+
@@ -131624,8 +131715,8 @@
-
-
+
+
@@ -136767,14 +136858,14 @@
-
-
-
+
+
+
-
-
-
+
+
+
@@ -137645,8 +137736,8 @@
-
-
+
+
@@ -137977,8 +138068,8 @@
-
-
+
+
@@ -140357,27 +140448,27 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
@@ -142762,8 +142853,8 @@
-
-
+
+
@@ -143299,11 +143390,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 5b208407c2a5..64ede998ff64 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -2802,6 +2802,7 @@
__traceiter_android_vh_ipi_stop
__traceiter_android_vh_ipv6_gen_linklocal_addr
__traceiter_android_vh_jiffies_update
+ __traceiter_android_vh_killed_process
__traceiter_android_vh_kmalloc_slab
__traceiter_android_vh_logbuf
__traceiter_android_vh_mem_cgroup_alloc
@@ -2811,6 +2812,7 @@
__traceiter_android_vh_mem_cgroup_id_remove
__traceiter_android_vh_meminfo_proc_show
__traceiter_android_vh_mutex_unlock_slowpath
+ __traceiter_android_vh_mutex_unlock_slowpath_end
__traceiter_android_vh_mutex_wait_finish
__traceiter_android_vh_mutex_wait_start
__traceiter_android_vh_override_creds
@@ -2819,10 +2821,14 @@
__traceiter_android_vh_prepare_update_load_avg_se
__traceiter_android_vh_printk_hotplug
__traceiter_android_vh_process_killed
- __traceiter_android_vh_killed_process
__traceiter_android_vh_revert_creds
__traceiter_android_vh_rmqueue
__traceiter_android_vh_rwsem_init
+ __traceiter_android_vh_rwsem_mark_wake_readers
+ __traceiter_android_vh_rwsem_set_owner
+ __traceiter_android_vh_rwsem_set_reader_owned
+ __traceiter_android_vh_rwsem_up_read_end
+ __traceiter_android_vh_rwsem_up_write_end
__traceiter_android_vh_rwsem_wake
__traceiter_android_vh_rwsem_wake_finish
__traceiter_android_vh_rwsem_write_finished
@@ -3010,6 +3016,7 @@
__tracepoint_android_vh_ipi_stop
__tracepoint_android_vh_ipv6_gen_linklocal_addr
__tracepoint_android_vh_jiffies_update
+ __tracepoint_android_vh_killed_process
__tracepoint_android_vh_kmalloc_slab
__tracepoint_android_vh_logbuf
__tracepoint_android_vh_mem_cgroup_alloc
@@ -3019,6 +3026,7 @@
__tracepoint_android_vh_mem_cgroup_id_remove
__tracepoint_android_vh_meminfo_proc_show
__tracepoint_android_vh_mutex_unlock_slowpath
+ __tracepoint_android_vh_mutex_unlock_slowpath_end
__tracepoint_android_vh_mutex_wait_finish
__tracepoint_android_vh_mutex_wait_start
__tracepoint_android_vh_override_creds
@@ -3027,10 +3035,14 @@
__tracepoint_android_vh_prepare_update_load_avg_se
__tracepoint_android_vh_printk_hotplug
__tracepoint_android_vh_process_killed
- __tracepoint_android_vh_killed_process
__tracepoint_android_vh_revert_creds
__tracepoint_android_vh_rmqueue
__tracepoint_android_vh_rwsem_init
+ __tracepoint_android_vh_rwsem_mark_wake_readers
+ __tracepoint_android_vh_rwsem_set_owner
+ __tracepoint_android_vh_rwsem_set_reader_owned
+ __tracepoint_android_vh_rwsem_up_read_end
+ __tracepoint_android_vh_rwsem_up_write_end
__tracepoint_android_vh_rwsem_wake
__tracepoint_android_vh_rwsem_wake_finish
__tracepoint_android_vh_rwsem_write_finished