diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index e4cf7cb9200f..ec32ec3a12df 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -653,6 +653,9 @@
+
+
+
@@ -671,6 +674,7 @@
+
@@ -689,6 +693,7 @@
+
@@ -1012,6 +1017,7 @@
+
@@ -1225,6 +1231,7 @@
+
@@ -1690,6 +1697,7 @@
+
@@ -1959,6 +1967,8 @@
+
+
@@ -1966,6 +1976,7 @@
+
@@ -2086,6 +2097,7 @@
+
@@ -2120,6 +2132,7 @@
+
@@ -3065,6 +3078,7 @@
+
@@ -3703,6 +3717,7 @@
+
@@ -4170,6 +4185,7 @@
+
@@ -4217,6 +4233,11 @@
+
+
+
+
+
@@ -18795,6 +18816,7 @@
+
@@ -20657,6 +20679,7 @@
+
@@ -23112,6 +23135,12 @@
+
+
+
+
+
+
@@ -30551,6 +30580,7 @@
+
@@ -34208,6 +34238,13 @@
+
+
+
+
+
+
+
@@ -41344,6 +41381,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -63549,6 +63597,7 @@
+
@@ -64478,6 +64527,7 @@
+
@@ -74268,6 +74318,7 @@
+
@@ -78683,6 +78734,9 @@
+
+
+
@@ -83847,6 +83901,7 @@
+
@@ -86646,6 +86701,9 @@
+
+
+
@@ -94759,6 +94817,7 @@
+
@@ -101211,7 +101270,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -109309,6 +109381,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -114750,6 +114833,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -114891,6 +114990,11 @@
+
+
+
+
+
@@ -114992,6 +115096,12 @@
+
+
+
+
+
+
@@ -116668,6 +116778,13 @@
+
+
+
+
+
+
+
@@ -117863,6 +117980,10 @@
+
+
+
+
@@ -120284,6 +120405,14 @@
+
+
+
+
+
+
+
+
@@ -121653,6 +121782,14 @@
+
+
+
+
+
+
+
+
@@ -121684,6 +121821,11 @@
+
+
+
+
+
@@ -122311,6 +122453,12 @@
+
+
+
+
+
+
@@ -122480,6 +122628,10 @@
+
+
+
+
@@ -124581,6 +124733,7 @@
+
@@ -127287,6 +127440,11 @@
+
+
+
+
+
@@ -130616,6 +130774,10 @@
+
+
+
+
diff --git a/android/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos
index 8630eba87b6e..23e3995975f6 100644
--- a/android/abi_gki_aarch64_exynos
+++ b/android/abi_gki_aarch64_exynos
@@ -1476,3 +1476,168 @@
iterate_fd
__traceiter_android_vh_show_mem
__tracepoint_android_vh_show_mem
+
+# required by samsung_iommu.ko
+ bus_set_iommu
+ device_link_add
+ device_link_del
+ devres_add
+ devres_alloc_node
+ iommu_alloc_resv_region
+ iommu_device_register
+ iommu_device_sysfs_add
+ iommu_device_sysfs_remove
+ iommu_device_unlink
+ iommu_device_unregister
+ iommu_fwspec_add_ids
+ iommu_fwspec_free
+ iommu_get_dma_cookie
+ iommu_group_for_each_dev
+ iommu_group_get
+ iommu_group_get_iommudata
+ iommu_group_set_iommudata
+ iommu_put_dma_cookie
+ iommu_report_device_fault
+ of_find_node_with_property
+ of_get_dma_window
+ platform_bus_type
+ split_page
+
+# required by scaler.ko
+ dma_heap_buffer_free
+ flush_delayed_work
+ of_parse_phandle_with_fixed_args
+ sg_nents_for_len
+ v4l2_m2m_try_schedule
+ work_busy
+
+# required by scsc_bt.ko
+ param_ops_ullong
+
+# required by scsc_log_collection.ko
+ list_sort
+
+# required by scsc_logring.ko
+ dev_vprintk_emit
+ vprintk_emit
+
+# required by scsc_mx.ko
+ genlmsg_multicast_allns
+ genlmsg_put
+ genl_register_family
+ genl_unregister_family
+ kobject_get
+ kobject_uevent
+
+# required by scsc_platform_mif.ko
+ irq_get_irqchip_state
+
+# required by scsc_wlan.ko
+ __cfg80211_alloc_event_skb
+ __cfg80211_alloc_reply_skb
+ cfg80211_chandef_create
+ cfg80211_chandef_valid
+ cfg80211_ch_switch_notify
+ cfg80211_classify8021d
+ cfg80211_connect_done
+ cfg80211_conn_failed
+ cfg80211_del_sta_sinfo
+ cfg80211_disconnected
+ cfg80211_external_auth_request
+ cfg80211_find_elem_match
+ cfg80211_find_vendor_elem
+ cfg80211_get_bss
+ cfg80211_inform_bss_frame_data
+ cfg80211_mgmt_tx_status
+ cfg80211_michael_mic_failure
+ cfg80211_new_sta
+ cfg80211_put_bss
+ cfg80211_ready_on_channel
+ cfg80211_ref_bss
+ cfg80211_remain_on_channel_expired
+ cfg80211_roamed
+ cfg80211_rx_mgmt_khz
+ cfg80211_scan_done
+ cfg80211_sched_scan_results
+ cfg80211_sched_scan_stopped
+ __cfg80211_send_event_skb
+ cfg80211_vendor_cmd_reply
+ consume_skb
+ csum_partial
+ csum_tcpudp_nofold
+ dev_alloc_name
+ dev_queue_xmit
+ ether_setup
+ eth_type_trans
+ ieee80211_channel_to_freq_khz
+ ieee80211_freq_khz_to_channel
+ ieee80211_get_channel_khz
+ ip_send_check
+ __kfifo_out
+ kfree_skb_list
+ __local_bh_enable_ip
+ napi_disable
+ netif_carrier_off
+ netif_carrier_on
+ __netif_napi_del
+ netif_rx_ni
+ netif_tx_stop_all_queues
+ net_ratelimit
+ nla_memcpy
+ nla_put_nohdr
+ __printk_ratelimit
+ _raw_read_lock_bh
+ _raw_read_unlock_bh
+ _raw_write_lock_bh
+ _raw_write_unlock_bh
+ register_inet6addr_notifier
+ register_inetaddr_notifier
+ register_netdevice
+ rps_needed
+ rtnl_is_locked
+ rtnl_lock
+ rtnl_unlock
+ skb_copy
+ skb_copy_bits
+ skb_realloc_headroom
+ synchronize_net
+ unregister_inet6addr_notifier
+ unregister_inetaddr_notifier
+ unregister_netdevice_queue
+ wiphy_apply_custom_regulatory
+ wiphy_free
+ wiphy_new_nm
+ wiphy_register
+ wiphy_unregister
+
+# required by smfc.ko
+ v4l2_ctrl_log_status
+ v4l2_m2m_fop_mmap
+ v4l2_m2m_fop_poll
+ v4l2_m2m_ioctl_dqbuf
+ v4l2_m2m_ioctl_querybuf
+ v4l2_m2m_ioctl_reqbufs
+ v4l2_m2m_ioctl_streamoff
+ v4l2_m2m_ioctl_streamon
+ vb2_ops_wait_finish
+ vb2_ops_wait_prepare
+ vb2_wait_for_all_buffers
+
+# required by snd-soc-aud3004x-5p.ko
+ devm_input_allocate_device
+ __devm_regmap_init
+ iio_channel_get_all
+ iio_channel_release
+ iio_read_channel_raw
+ of_parse_phandle_with_args
+ regcache_cache_bypass
+ wakeup_source_create
+ wakeup_source_destroy
+
+# required by snd-soc-aud3004x-dump.ko
+ class_create_file_ns
+ strspn
+
+# required by snd-soc-s3c-dma.ko
+ devm_snd_dmaengine_pcm_register
+ snd_dmaengine_pcm_prepare_slave_config