diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 99419ee33dc4..524faae3504e 100755
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -257,6 +257,9 @@
+
+
+
@@ -282,6 +285,7 @@
+
@@ -370,6 +374,7 @@
+
@@ -383,6 +388,7 @@
+
@@ -748,6 +754,7 @@
+
@@ -778,6 +785,7 @@
+
@@ -961,6 +969,7 @@
+
@@ -979,6 +988,7 @@
+
@@ -1705,6 +1715,7 @@
+
@@ -1993,6 +2004,7 @@
+
@@ -2080,10 +2092,13 @@
+
+
+
@@ -2112,6 +2127,7 @@
+
@@ -2147,6 +2163,7 @@
+
@@ -2156,6 +2173,7 @@
+
@@ -2171,6 +2189,7 @@
+
@@ -2229,6 +2248,7 @@
+
@@ -2437,6 +2457,7 @@
+
@@ -2884,6 +2905,7 @@
+
@@ -2962,6 +2984,7 @@
+
@@ -3282,6 +3305,7 @@
+
@@ -3386,6 +3410,8 @@
+
+
@@ -4800,6 +4826,7 @@
+
@@ -5009,6 +5036,9 @@
+
+
+
@@ -5034,6 +5064,7 @@
+
@@ -7381,6 +7412,11 @@
+
+
+
+
+
@@ -7880,6 +7916,10 @@
+
+
+
+
@@ -10693,6 +10733,7 @@
+
@@ -13047,6 +13088,7 @@
+
@@ -13060,6 +13102,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -28514,6 +28569,7 @@
+
@@ -28904,6 +28960,10 @@
+
+
+
+
@@ -36116,6 +36176,7 @@
+
@@ -42711,6 +42772,7 @@
+
@@ -43676,6 +43738,7 @@
+
@@ -51095,6 +51158,7 @@
+
@@ -52861,6 +52925,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -54785,7 +54884,7 @@
-
+
@@ -60739,6 +60838,7 @@
+
@@ -63174,6 +63274,7 @@
+
@@ -76699,6 +76800,7 @@
+
@@ -80196,6 +80298,7 @@
+
@@ -89880,6 +89983,7 @@
+
@@ -93788,6 +93892,7 @@
+
@@ -98101,7 +98206,7 @@
-
+
@@ -98327,6 +98432,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99626,6 +99778,11 @@
+
+
+
+
+
@@ -102691,6 +102848,7 @@
+
@@ -105295,6 +105453,10 @@
+
+
+
+
@@ -109671,6 +109833,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -109839,6 +110025,13 @@
+
+
+
+
+
+
+
@@ -110401,6 +110594,11 @@
+
+
+
+
+
@@ -110482,6 +110680,12 @@
+
+
+
+
+
+
@@ -111094,6 +111298,9 @@
+
+
+
@@ -111119,6 +111326,7 @@
+
@@ -112732,6 +112940,13 @@
+
+
+
+
+
+
+
@@ -112957,6 +113172,11 @@
+
+
+
+
+
@@ -113879,6 +114099,10 @@
+
+
+
+
@@ -113962,6 +114186,10 @@
+
+
+
+
@@ -117849,6 +118077,12 @@
+
+
+
+
+
+
@@ -119339,6 +119573,11 @@
+
+
+
+
+
@@ -119805,6 +120044,11 @@
+
+
+
+
+
@@ -119821,10 +120065,21 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -119971,6 +120226,9 @@
+
+
+
@@ -120155,6 +120413,11 @@
+
+
+
+
+
@@ -120200,6 +120463,10 @@
+
+
+
+
@@ -120271,6 +120538,10 @@
+
+
+
+
@@ -120545,6 +120816,10 @@
+
+
+
+
@@ -121611,6 +121886,14 @@
+
+
+
+
+
+
+
+
@@ -123863,6 +124146,13 @@
+
+
+
+
+
+
+
@@ -124264,6 +124554,10 @@
+
+
+
+
@@ -125921,6 +126215,11 @@
+
+
+
+
+
@@ -126443,6 +126742,14 @@
+
+
+
+
+
+
+
+
@@ -133672,6 +133979,13 @@
+
+
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy
index c944f9221ae1..a6d6c37a2f7a 100644
--- a/android/abi_gki_aarch64_galaxy
+++ b/android/abi_gki_aarch64_galaxy
@@ -223,6 +223,117 @@ __tasklet_schedule
__trace_bprintk
__trace_bputs
__trace_printk
+__traceiter_android_rvh_account_irq
+__traceiter_android_rvh_build_perf_domains
+__traceiter_android_rvh_can_migrate_task
+__traceiter_android_rvh_check_preempt_wakeup
+__traceiter_android_rvh_cpu_cgroup_attach
+__traceiter_android_rvh_cpu_cgroup_can_attach
+__traceiter_android_rvh_cpu_cgroup_online
+__traceiter_android_rvh_cpu_overutilized
+__traceiter_android_rvh_cpufreq_transition
+__traceiter_android_rvh_dequeue_task
+__traceiter_android_rvh_die_kernel_fault
+__traceiter_android_rvh_do_mem_abort
+__traceiter_android_rvh_do_sp_pc_abort
+__traceiter_android_rvh_enqueue_task
+__traceiter_android_rvh_find_busiest_queue
+__traceiter_android_rvh_find_energy_efficient_cpu
+__traceiter_android_rvh_find_lowest_rq
+__traceiter_android_rvh_flush_task
+__traceiter_android_rvh_irqs_disable
+__traceiter_android_rvh_irqs_enable
+__traceiter_android_rvh_migrate_queued_task
+__traceiter_android_rvh_new_task_stats
+__traceiter_android_rvh_pick_next_entity
+__traceiter_android_rvh_place_entity
+__traceiter_android_rvh_preempt_disable
+__traceiter_android_rvh_preempt_enable
+__traceiter_android_rvh_replace_next_task_fair
+__traceiter_android_rvh_report_bug
+__traceiter_android_rvh_resume_cpus
+__traceiter_android_rvh_sched_balance_rt
+__traceiter_android_rvh_sched_cpu_dying
+__traceiter_android_rvh_sched_cpu_starting
+__traceiter_android_rvh_sched_exec
+__traceiter_android_rvh_sched_fork
+__traceiter_android_rvh_sched_fork_init
+__traceiter_android_rvh_sched_newidle_balance
+__traceiter_android_rvh_sched_nohz_balancer_kick
+__traceiter_android_rvh_sched_rebalance_domains
+__traceiter_android_rvh_schedule
+__traceiter_android_rvh_schedule_bug
+__traceiter_android_rvh_select_fallback_rq
+__traceiter_android_rvh_select_task_rq_fair
+__traceiter_android_rvh_select_task_rq_rt
+__traceiter_android_rvh_set_gfp_zone_flags
+__traceiter_android_rvh_set_iowait
+__traceiter_android_rvh_set_readahead_gfp_mask
+__traceiter_android_rvh_set_skip_swapcache_flags
+__traceiter_android_rvh_set_task_cpu
+__traceiter_android_rvh_tick_entry
+__traceiter_android_rvh_try_to_wake_up
+__traceiter_android_rvh_try_to_wake_up_success
+__traceiter_android_rvh_ttwu_cond
+__traceiter_android_rvh_typec_tcpci_chk_contaminant
+__traceiter_android_rvh_typec_tcpci_get_vbus
+__traceiter_android_rvh_uclamp_eff_get
+__traceiter_android_rvh_update_cpu_capacity
+__traceiter_android_rvh_update_cpus_allowed
+__traceiter_android_rvh_update_misfit_status
+__traceiter_android_rvh_util_est_update
+__traceiter_android_rvh_wake_up_new_task
+__traceiter_android_vh_allow_domain_state
+__traceiter_android_vh_arch_set_freq_scale
+__traceiter_android_vh_binder_restore_priority
+__traceiter_android_vh_binder_set_priority
+__traceiter_android_vh_binder_transaction_init
+__traceiter_android_vh_binder_wakeup_ilocked
+__traceiter_android_vh_cma_alloc_finish
+__traceiter_android_vh_cma_alloc_start
+__traceiter_android_vh_cpu_idle_enter
+__traceiter_android_vh_cpu_idle_exit
+__traceiter_android_vh_dump_throttled_rt_tasks
+__traceiter_android_vh_enable_thermal_genl_check
+__traceiter_android_vh_ep_create_wakeup_source
+__traceiter_android_vh_freq_table_limits
+__traceiter_android_vh_ftrace_dump_buffer
+__traceiter_android_vh_ftrace_format_check
+__traceiter_android_vh_ftrace_oops_enter
+__traceiter_android_vh_ftrace_oops_exit
+__traceiter_android_vh_ftrace_size_check
+__traceiter_android_vh_iommu_setup_dma_ops
+__traceiter_android_vh_ipi_stop
+__traceiter_android_vh_is_fpsimd_save
+__traceiter_android_vh_jiffies_update
+__traceiter_android_vh_kfree_skb
+__traceiter_android_vh_logbuf
+__traceiter_android_vh_logbuf_pr_cont
+__traceiter_android_vh_meminfo_proc_show
+__traceiter_android_vh_pagecache_get_page
+__traceiter_android_vh_printk_hotplug
+__traceiter_android_vh_ptype_head
+__traceiter_android_vh_rmqueue
+__traceiter_android_vh_scheduler_tick
+__traceiter_android_vh_show_max_freq
+__traceiter_android_vh_show_mem
+__traceiter_android_vh_show_resume_epoch_val
+__traceiter_android_vh_show_suspend_epoch_val
+__traceiter_android_vh_timer_calc_index
+__traceiter_android_vh_timerfd_create
+__traceiter_android_vh_typec_store_partner_src_caps
+__traceiter_android_vh_typec_tcpci_override_toggling
+__traceiter_android_vh_typec_tcpm_adj_current_limit
+__traceiter_android_vh_typec_tcpm_get_timer
+__traceiter_android_vh_ufs_check_int_errors
+__traceiter_android_vh_ufs_compl_command
+__traceiter_android_vh_ufs_fill_prdt
+__traceiter_android_vh_ufs_prepare_command
+__traceiter_android_vh_ufs_send_command
+__traceiter_android_vh_ufs_send_tm_command
+__traceiter_android_vh_ufs_send_uic_command
+__traceiter_android_vh_ufs_update_sdev
+__traceiter_android_vh_ufs_update_sysfs
__traceiter_clock_set_rate
__traceiter_cpu_frequency
__traceiter_dma_fence_emit
@@ -241,6 +352,9 @@ __tracepoint_android_rvh_cpu_cgroup_online
__tracepoint_android_rvh_cpu_overutilized
__tracepoint_android_rvh_cpufreq_transition
__tracepoint_android_rvh_dequeue_task
+__tracepoint_android_rvh_die_kernel_fault
+__tracepoint_android_rvh_do_mem_abort
+__tracepoint_android_rvh_do_sp_pc_abort
__tracepoint_android_rvh_enqueue_task
__tracepoint_android_rvh_find_busiest_queue
__tracepoint_android_rvh_find_energy_efficient_cpu
@@ -255,6 +369,7 @@ __tracepoint_android_rvh_place_entity
__tracepoint_android_rvh_preempt_disable
__tracepoint_android_rvh_preempt_enable
__tracepoint_android_rvh_replace_next_task_fair
+__tracepoint_android_rvh_report_bug
__tracepoint_android_rvh_resume_cpus
__tracepoint_android_rvh_sched_balance_rt
__tracepoint_android_rvh_sched_cpu_dying
@@ -308,9 +423,11 @@ __tracepoint_android_vh_ftrace_oops_exit
__tracepoint_android_vh_ftrace_size_check
__tracepoint_android_vh_iommu_setup_dma_ops
__tracepoint_android_vh_ipi_stop
+__tracepoint_android_vh_is_fpsimd_save
__tracepoint_android_vh_jiffies_update
__tracepoint_android_vh_kfree_skb
__tracepoint_android_vh_logbuf
+__tracepoint_android_vh_logbuf_pr_cont
__tracepoint_android_vh_meminfo_proc_show
__tracepoint_android_vh_pagecache_get_page
__tracepoint_android_vh_printk_hotplug
@@ -318,6 +435,7 @@ __tracepoint_android_vh_ptype_head
__tracepoint_android_vh_rmqueue
__tracepoint_android_vh_scheduler_tick
__tracepoint_android_vh_show_max_freq
+__tracepoint_android_vh_show_mem
__tracepoint_android_vh_show_resume_epoch_val
__tracepoint_android_vh_show_suspend_epoch_val
__tracepoint_android_vh_timer_calc_index
@@ -607,6 +725,7 @@ blk_sync_queue
blk_unregister_region
blk_update_request
blk_verify_command
+blkdev_fsync
blkdev_get_by_dev
blkdev_get_by_path
blkdev_issue_flush
@@ -635,6 +754,7 @@ bpf_trace_run9
bpf_warn_invalid_xdp_action
bsearch
bt_err
+bt_info
build_skb
bus_find_device
bus_for_each_dev
@@ -680,6 +800,7 @@ class_destroy
class_find_device
class_for_each_device
class_interface_unregister
+class_remove_file_ns
class_unregister
cleancache_register_ops
cleanup_srcu_struct
@@ -814,6 +935,7 @@ cpufreq_table_index_unsorted
cpufreq_this_cpu_can_update
cpufreq_unregister_driver
cpufreq_unregister_notifier
+cpufreq_update_policy
cpuhp_tasks_frozen
cpuidle_governor_latency_req
cpuidle_register_governor
@@ -827,6 +949,7 @@ cpus_read_unlock
crc32_le
crc8
crc8_populate_msb
+create_function_device
crypto_aead_encrypt
crypto_aead_setauthsize
crypto_aead_setkey
@@ -1438,6 +1561,7 @@ drm_dp_update_payload_part1
drm_dp_update_payload_part2
drm_edid_block_valid
drm_edid_duplicate
+drm_edid_get_monitor_name
drm_edid_header_is_valid
drm_edid_is_valid
drm_edid_to_sad
@@ -1714,6 +1838,7 @@ fasync_helper
fd_install
fget
file_path
+file_ra_state_init
filp_close
filp_open_block
find_get_pid
@@ -1726,6 +1851,7 @@ find_vma
find_vpid
finish_wait
firmware_request_nowarn
+fixed_size_llseek
flow_keys_basic_dissector
flush_dcache_page
flush_delayed_work
@@ -1783,9 +1909,12 @@ gen_pool_virt_to_phys
generic_delete_inode
generic_device_group
generic_file_llseek
+generic_file_read_iter
generic_handle_irq
generic_iommu_put_resv_regions
generic_mii_ioctl
+generic_perform_write
+generic_write_checks
genl_notify
genl_register_family
genl_unregister_family
@@ -1805,6 +1934,7 @@ get_pid_task
get_random_bytes
get_random_bytes_arch
get_random_u32
+get_random_u64
get_sg_io_hdr
get_state_synchronize_rcu
get_task_exe_file
@@ -1839,6 +1969,7 @@ gpio_request_one
gpio_to_desc
gpiochip_add_data_with_key
gpiochip_add_pin_range
+gpiochip_find
gpiochip_generic_config
gpiochip_generic_free
gpiochip_generic_request
@@ -1848,6 +1979,7 @@ gpiochip_lock_as_irq
gpiochip_populate_parent_fwspec_fourcell
gpiochip_remove
gpiochip_unlock_as_irq
+gpiod_cansleep
gpiod_count
gpiod_direction_input
gpiod_direction_output
@@ -1863,6 +1995,7 @@ gpiod_set_raw_value
gpiod_set_raw_value_cansleep
gpiod_set_value
gpiod_set_value_cansleep
+gpiod_to_chip
gpiod_to_irq
gro_cells_destroy
gro_cells_init
@@ -1918,6 +2051,7 @@ i2c_adapter_type
i2c_add_adapter
i2c_add_numbered_adapter
i2c_bit_add_bus
+i2c_bit_add_numbered_bus
i2c_bus_type
i2c_client_type
i2c_del_adapter
@@ -1998,6 +2132,7 @@ iio_device_free
iio_device_unregister
iio_push_to_buffers
iio_read_channel_processed
+iio_read_channel_raw
import_iovec
in4_pton
in6_pton
@@ -2098,6 +2233,7 @@ iommu_unmap
iommu_unregister_device_fault_handler
iounmap
iov_iter_bvec
+iov_iter_kvec
ip_compute_csum
ip_send_check
ipi_desc_get
@@ -2202,6 +2338,8 @@ kmem_cache_destroy
kmem_cache_free
kmemdup
kmemdup_nul
+kmsg_dump_get_line
+kmsg_dump_rewind
kobj_sysfs_ops
kobject_add
kobject_create_and_add
@@ -2443,6 +2581,7 @@ mutex_lock_interruptible
mutex_trylock
mutex_trylock_recursive
mutex_unlock
+name_to_dev_t
names_cachep
napi_complete_done
napi_consume_skb
@@ -2482,6 +2621,7 @@ netif_set_real_num_tx_queues
netif_stacked_transfer_operstate
netif_tx_stop_all_queues
netif_tx_wake_queue
+netlink_ack
netlink_broadcast
netlink_capable
netlink_has_listeners
@@ -2555,6 +2695,7 @@ of_dma_controller_register
of_dma_is_coherent
of_drm_find_bridge
of_drm_find_panel
+of_find_all_nodes
of_find_compatible_node
of_find_device_by_node
of_find_i2c_adapter_by_node
@@ -2834,6 +2975,7 @@ pinctrl_utils_free_map
pipe_lock
pipe_unlock
pktgen_xfrm_outer_mode_output
+platform_add_devices
platform_bus_type
platform_device_add
platform_device_add_data
@@ -2934,6 +3076,8 @@ ps2_init
ps2_sendbyte
ps2_sliced_command
pskb_expand_head
+pstore_register
+pstore_unregister
put_device
put_disk
put_iova_domain
@@ -4177,6 +4321,7 @@ vchan_init
vchan_tx_desc_free
vchan_tx_submit
vfree
+vfs_fsync_range
video_devdata
video_device_alloc
video_device_release