diff --git a/android/abi_gki_aarch64 b/android/abi_gki_aarch64
index c1a3d1077e16..57914f291962 100644
--- a/android/abi_gki_aarch64
+++ b/android/abi_gki_aarch64
@@ -1,144 +1,4 @@
[abi_symbol_list]
# commonly used symbols
- arm64_const_caps_ready
- __cpuhp_remove_state
- __cpuhp_setup_state
- cpu_hwcap_keys
- kasan_flag_enabled
- kfree
- kmalloc_caches
- kmem_cache_alloc_trace
- memcpy
module_layout
- __per_cpu_offset
- preempt_schedule
- _printk
__put_task_struct
- __stack_chk_fail
- __ubsan_handle_cfi_check_fail_abort
-
-# required by zram.ko
- __alloc_percpu
- bio_endio
- bio_end_io_acct_remapped
- bio_start_io_acct
- __blk_alloc_disk
- blk_cleanup_disk
- blk_queue_flag_clear
- blk_queue_flag_set
- blk_queue_io_min
- blk_queue_io_opt
- blk_queue_logical_block_size
- blk_queue_max_discard_sectors
- blk_queue_max_write_zeroes_sectors
- blk_queue_physical_block_size
- __class_register
- class_unregister
- __cpuhp_state_add_instance
- __cpuhp_state_remove_instance
- cpumask_next
- __cpu_possible_mask
- crypto_alloc_base
- crypto_comp_compress
- crypto_comp_decompress
- crypto_destroy_tfm
- crypto_has_alg
- del_gendisk
- device_add_disk
- disk_end_io_acct
- disk_start_io_acct
- down_read
- down_write
- flush_dcache_page
- free_pages
- free_percpu
- fsync_bdev
- __get_free_pages
- idr_alloc
- idr_destroy
- idr_find
- idr_for_each
- idr_remove
- __init_rwsem
- kstrtoint
- kstrtou16
- kstrtoull
- memparse
- memset64
- mutex_is_locked
- mutex_lock
- mutex_unlock
- nr_cpu_ids
- __num_online_cpus
- page_endio
- param_ops_uint
- __register_blkdev
- scnprintf
- set_capacity
- set_capacity_and_notify
- snprintf
- strcmp
- strcpy
- strlcpy
- strlen
- __sysfs_match_string
- sysfs_streq
- unregister_blkdev
- up_read
- up_write
- vfree
- vzalloc
- zs_compact
- zs_create_pool
- zs_destroy_pool
- zs_free
- zs_get_total_pages
- zs_huge_class_size
- zs_malloc
- zs_map_object
- zs_pool_stats
- zs_unmap_object
-
-# required by zsmalloc.ko
- alloc_anon_inode
- __alloc_pages
- __ClearPageMovable
- contig_page_data
- dec_zone_page_state
- finish_wait
- flush_work
- __free_pages
- inc_zone_page_state
- init_pseudo
- init_wait_entry
- __init_waitqueue_head
- iput
- kern_mount
- kern_unmount
- kill_anon_super
- kmem_cache_alloc
- kmem_cache_create
- kmem_cache_destroy
- kmem_cache_free
- kstrdup
- __list_add_valid
- __list_del_entry_valid
- __lock_page
- memstart_addr
- page_mapping
- prepare_to_wait_event
- __put_page
- queue_work_on
- _raw_read_lock
- _raw_read_unlock
- _raw_spin_lock
- _raw_spin_unlock
- _raw_write_lock
- _raw_write_unlock
- register_shrinker
- schedule
- __SetPageMovable
- system_wq
- unlock_page
- unregister_shrinker
- __wake_up
diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index cd45c12425a4..eca1cea85cd6 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -19,6 +19,7 @@
+
@@ -118499,6 +118500,10 @@
+
+
+
+
@@ -122763,8 +122768,8 @@
-
-
+
+
@@ -125585,11 +125590,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -130880,10 +130885,10 @@
-
-
-
-
+
+
+
+
@@ -133440,11 +133445,11 @@
-
+
-
-
+
+
@@ -134381,7 +134386,7 @@
-
+
@@ -134715,7 +134720,7 @@
-
+
@@ -138944,8 +138949,8 @@
-
-
+
+
@@ -139738,10 +139743,10 @@
-
+
-
+
@@ -140982,8 +140987,8 @@
-
-
+
+
@@ -141048,34 +141053,34 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -141203,7 +141208,7 @@
-
+
@@ -141665,43 +141670,43 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
@@ -141739,7 +141744,7 @@
-
+
@@ -142484,9 +142489,9 @@
-
-
-
+
+
+
@@ -145241,8 +145246,8 @@
-
-
+
+
@@ -149965,7 +149970,7 @@
-
+