diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 3f92341a62d5..c3a7ec57372e 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -39,6 +39,7 @@
+
@@ -87,6 +88,7 @@
+
@@ -116,6 +118,7 @@
+
@@ -364,6 +367,8 @@
+
+
@@ -658,6 +663,7 @@
+
@@ -673,6 +679,7 @@
+
@@ -686,9 +693,11 @@
+
+
@@ -932,13 +941,16 @@
+
+
+
@@ -959,6 +971,11 @@
+
+
+
+
+
@@ -1024,6 +1041,8 @@
+
+
@@ -1208,6 +1227,7 @@
+
@@ -1624,6 +1644,9 @@
+
+
+
@@ -1775,9 +1798,11 @@
+
+
@@ -1881,7 +1906,15 @@
+
+
+
+
+
+
+
+
@@ -2121,6 +2154,7 @@
+
@@ -2128,6 +2162,8 @@
+
+
@@ -2321,6 +2357,7 @@
+
@@ -2391,6 +2428,7 @@
+
@@ -2522,6 +2560,8 @@
+
+
@@ -2574,6 +2614,12 @@
+
+
+
+
+
+
@@ -2738,6 +2784,7 @@
+
@@ -2752,11 +2799,13 @@
+
+
@@ -2776,6 +2825,7 @@
+
@@ -2847,6 +2897,8 @@
+
+
@@ -3904,8 +3956,14 @@
+
+
+
+
+
+
@@ -3998,6 +4056,7 @@
+
@@ -4928,6 +4987,14 @@
+
+
+
+
+
+
+
+
@@ -5485,6 +5552,14 @@
+
+
+
+
+
+
+
+
@@ -6539,34 +6614,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7326,6 +7401,7 @@
+
@@ -7992,6 +8068,10 @@
+
+
+
+
@@ -9241,6 +9321,11 @@
+
+
+
+
+
@@ -9510,6 +9595,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -9564,6 +9666,11 @@
+
+
+
+
+
@@ -11253,6 +11360,7 @@
+
@@ -11328,6 +11436,7 @@
+
@@ -12507,6 +12616,7 @@
+
@@ -12584,6 +12694,7 @@
+
@@ -14459,6 +14570,7 @@
+
@@ -16933,6 +17045,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -18099,6 +18228,7 @@
+
@@ -19970,6 +20100,10 @@
+
+
+
+
@@ -20171,6 +20305,7 @@
+
@@ -20854,6 +20989,7 @@
+
@@ -21655,6 +21791,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -23484,6 +23634,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25663,6 +25830,7 @@
+
@@ -26576,6 +26744,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -26861,6 +27046,7 @@
+
@@ -28196,6 +28382,7 @@
+
@@ -28332,6 +28519,7 @@
+
@@ -28565,6 +28753,11 @@
+
+
+
+
+
@@ -28723,6 +28916,11 @@
+
+
+
+
+
@@ -31235,6 +31433,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -33881,6 +34093,7 @@
+
@@ -34798,6 +35011,11 @@
+
+
+
+
+
@@ -35607,6 +35825,7 @@
+
@@ -36992,13 +37211,13 @@
-
+
-
+
@@ -38007,7 +38226,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -40224,6 +40465,7 @@
+
@@ -41104,6 +41346,14 @@
+
+
+
+
+
+
+
+
@@ -44627,6 +44877,7 @@
+
@@ -46657,6 +46908,7 @@
+
@@ -47772,6 +48024,7 @@
+
@@ -48133,6 +48386,9 @@
+
+
+
@@ -48406,6 +48662,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48584,6 +48860,7 @@
+
@@ -49768,6 +50045,12 @@
+
+
+
+
+
+
@@ -51192,6 +51475,7 @@
+
@@ -51223,6 +51507,7 @@
+
@@ -51633,6 +51918,14 @@
+
+
+
+
+
+
+
+
@@ -52871,6 +53164,11 @@
+
+
+
+
+
@@ -54494,6 +54792,7 @@
+
@@ -55567,6 +55866,7 @@
+
@@ -55753,6 +56053,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -61038,6 +61361,7 @@
+
@@ -61529,6 +61853,7 @@
+
@@ -62930,6 +63255,14 @@
+
+
+
+
+
+
+
+
@@ -65200,6 +65533,11 @@
+
+
+
+
+
@@ -65816,6 +66154,7 @@
+
@@ -66183,6 +66522,10 @@
+
+
+
+
@@ -66758,6 +67101,10 @@
+
+
+
+
@@ -66833,6 +67180,7 @@
+
@@ -66859,6 +67207,7 @@
+
@@ -67985,6 +68334,7 @@
+
@@ -68548,6 +68898,11 @@
+
+
+
+
+
@@ -69466,6 +69821,7 @@
+
@@ -72334,6 +72690,11 @@
+
+
+
+
+
@@ -72433,6 +72794,7 @@
+
@@ -72813,6 +73175,7 @@
+
@@ -74268,6 +74631,7 @@
+
@@ -75167,6 +75531,7 @@
+
@@ -77220,6 +77585,7 @@
+
@@ -77785,6 +78151,7 @@
+
@@ -78279,6 +78646,7 @@
+
@@ -81155,6 +81523,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86888,6 +87276,7 @@
+
@@ -87022,6 +87411,10 @@
+
+
+
+
@@ -89563,6 +89956,7 @@
+
@@ -92343,6 +92737,11 @@
+
+
+
+
+
@@ -92590,6 +92989,7 @@
+
@@ -93587,6 +93987,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -95358,6 +95769,14 @@
+
+
+
+
+
+
+
+
@@ -95396,6 +95815,7 @@
+
@@ -100822,6 +101242,7 @@
+
@@ -101301,6 +101722,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102045,6 +102486,7 @@
+
@@ -102252,7 +102694,7 @@
-
+
@@ -102279,7 +102721,7 @@
-
+
@@ -102754,6 +103196,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102907,6 +103372,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103369,7 +103848,50 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -104957,6 +105479,7 @@
+
@@ -107079,6 +107602,7 @@
+
@@ -107974,6 +108498,7 @@
+
@@ -109686,6 +110211,11 @@
+
+
+
+
+
@@ -109970,6 +110500,11 @@
+
+
+
+
+
@@ -110158,6 +110693,13 @@
+
+
+
+
+
+
+
@@ -111805,6 +112347,14 @@
+
+
+
+
+
+
+
+
@@ -113438,6 +113988,11 @@
+
+
+
+
+
@@ -113447,12 +114002,16 @@
+
+
+
+
@@ -113504,6 +114063,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -113540,6 +114113,8 @@
+
+
@@ -113569,6 +114144,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -113597,6 +114185,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -114838,6 +115440,11 @@
+
+
+
+
+
@@ -114852,6 +115459,11 @@
+
+
+
+
+
@@ -114874,6 +115486,10 @@
+
+
+
+
@@ -114979,6 +115595,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -115317,6 +115957,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -116382,6 +117032,10 @@
+
+
+
+
@@ -118536,6 +119190,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -119281,6 +119947,13 @@
+
+
+
+
+
+
+
@@ -119297,6 +119970,13 @@
+
+
+
+
+
+
+
@@ -119838,10 +120518,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -121093,6 +121812,12 @@
+
+
+
+
+
+
@@ -121125,6 +121850,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122070,6 +122808,10 @@
+
+
+
+
@@ -122416,6 +123158,11 @@
+
+
+
+
+
@@ -123126,6 +123873,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -123382,6 +124140,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124211,6 +124995,10 @@
+
+
+
+
@@ -124280,6 +125068,11 @@
+
+
+
+
+
@@ -124305,6 +125098,11 @@
+
+
+
+
+
@@ -124412,6 +125210,10 @@
+
+
+
+
@@ -124749,6 +125551,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -126933,6 +127745,7 @@
+
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index e69de29bb2d1..07fd8de4b52f 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -0,0 +1,434 @@
+[abi_symbol_list]
+# commonly used symbols
+ atomic_notifier_chain_register
+ cancel_delayed_work_sync
+ __cfi_slowpath
+ clk_bulk_disable
+ clk_bulk_enable
+ clk_bulk_prepare
+ clk_bulk_unprepare
+ clk_disable
+ clk_enable
+ clk_gate_ops
+ clk_get
+ __clk_get_name
+ clk_get_rate
+ clk_notifier_register
+ clk_prepare
+ clk_put
+ clk_register
+ clk_set_rate
+ clk_unprepare
+ __const_udelay
+ cpumask_next
+ __cpu_online_mask
+ __cpu_possible_mask
+ delayed_work_timer_fn
+ _dev_err
+ devfreq_recommended_opp
+ device_init_wakeup
+ _dev_info
+ devm_clk_bulk_get_all
+ devm_clk_get
+ devm_clk_hw_register
+ devm_clk_register
+ devm_ioremap_resource
+ devm_kfree
+ devm_kmalloc
+ devm_nvmem_register
+ devm_platform_ioremap_resource
+ devm_regulator_get
+ devm_regulator_get_optional
+ devm_request_threaded_irq
+ devm_reset_control_array_get
+ dev_pm_opp_find_freq_ceil
+ dev_pm_opp_get_opp_count
+ dev_pm_opp_get_opp_table
+ dev_pm_opp_get_voltage
+ dev_pm_opp_put
+ dev_pm_opp_put_opp_table
+ devres_add
+ devres_alloc_node
+ devres_free
+ _dev_warn
+ down_read
+ down_write
+ init_timer_key
+ iounmap
+ irq_set_irq_wake
+ irq_to_desc
+ kfree
+ __kmalloc
+ kmalloc_caches
+ kmem_cache_alloc_trace
+ ktime_get
+ __list_add_valid
+ __log_post_read_mmio
+ __log_read_mmio
+ __log_write_mmio
+ memcpy
+ module_layout
+ __msecs_to_jiffies
+ msleep
+ __mutex_init
+ mutex_lock
+ mutex_unlock
+ nr_cpu_ids
+ nvmem_cell_put
+ nvmem_cell_read
+ of_clk_add_provider
+ of_clk_del_provider
+ of_clk_get
+ of_clk_get_by_name
+ of_clk_get_parent_count
+ of_clk_src_simple_get
+ of_count_phandle_with_args
+ of_device_get_match_data
+ of_device_is_available
+ of_find_matching_node_and_match
+ of_find_property
+ of_get_next_available_child
+ of_get_next_child
+ of_iomap
+ of_match_device
+ of_match_node
+ of_nvmem_cell_get
+ of_parse_phandle
+ of_property_count_elems_of_size
+ of_property_read_string
+ of_property_read_string_helper
+ of_property_read_u32_index
+ of_property_read_variable_u32_array
+ panic_notifier_list
+ __platform_driver_probe
+ __platform_driver_register
+ platform_driver_unregister
+ platform_get_irq
+ platform_get_resource
+ pm_clk_create
+ pm_clk_destroy
+ print_hex_dump
+ printk
+ __put_task_struct
+ queue_delayed_work_on
+ regmap_read
+ regmap_update_bits_base
+ regmap_write
+ regulator_disable
+ regulator_enable
+ regulator_get_voltage
+ regulator_put
+ regulator_set_voltage
+ reset_control_assert
+ reset_control_deassert
+ snprintf
+ sprintf
+ __stack_chk_fail
+ strcmp
+ syscon_node_to_regmap
+ syscon_regmap_lookup_by_phandle
+ sysfs_create_file_ns
+ system_freezable_wq
+ system_wq
+ thermal_zone_get_zone_by_name
+ __traceiter_rwmmio_post_read
+ __traceiter_rwmmio_read
+ __traceiter_rwmmio_write
+ __tracepoint_rwmmio_post_read
+ __tracepoint_rwmmio_read
+ __tracepoint_rwmmio_write
+ __udelay
+ update_devfreq
+ up_read
+ up_write
+ usleep_range
+
+# required by clk-link.ko
+ pm_clk_add
+ pm_clk_resume
+ pm_clk_suspend
+ __pm_runtime_disable
+ pm_runtime_enable
+
+# required by clk-pwm.ko
+ devm_pwm_get
+ of_clk_add_hw_provider
+ of_clk_hw_simple_get
+ pwm_apply_state
+
+# required by clk-rockchip.ko
+ clk_divider_ops
+ clk_divider_ro_ops
+ clk_fixed_factor_ops
+ clk_fractional_divider_ops
+ __clk_get_hw
+ clk_get_parent
+ clk_hw_get_flags
+ clk_hw_get_name
+ clk_hw_get_parent
+ clk_hw_get_rate
+ clk_hw_register_composite
+ clk_hw_round_rate
+ __clk_mux_determine_rate
+ clk_mux_ops
+ clk_mux_ro_ops
+ clk_notifier_unregister
+ clk_register_divider_table
+ clk_register_fixed_factor
+ clk_register_gate
+ clk_register_mux_table
+ clk_unregister
+ gcd
+ kmemdup
+ match_string
+ of_clk_src_onecell_get
+ rational_best_approximation
+ _raw_spin_lock_irqsave
+ _raw_spin_unlock_irqrestore
+ register_restart_handler
+ reset_controller_register
+ __warn_printk
+
+# required by clk-scmi.ko
+ clk_hw_set_rate_range
+ devm_of_clk_add_hw_provider
+ of_clk_hw_onecell_get
+ scmi_driver_register
+ scmi_driver_unregister
+
+# required by industrialio-triggered-buffer.ko
+ iio_alloc_pollfunc
+ iio_dealloc_pollfunc
+ iio_device_attach_buffer
+
+# required by io-domain.ko
+ _dev_crit
+ regulator_register_notifier
+ regulator_unregister_notifier
+
+# required by kfifo_buf.ko
+ iio_buffer_init
+ iio_buffer_put
+ __kfifo_alloc
+ __kfifo_free
+ __kfifo_in
+ __kfifo_to_user
+ mutex_lock_interruptible
+
+# required by nvmem-rockchip-otp.ko
+ devm_clk_bulk_get
+ param_ops_uint
+
+# required by pm_domains.ko
+ clk_bulk_put
+ of_genpd_add_provider_onecell
+ panic
+ param_ops_bool
+ pm_clk_add_clk
+ pm_genpd_add_subdomain
+ pm_genpd_init
+ pm_genpd_remove
+ strrchr
+
+# required by rockchip-cpuinfo.ko
+ nvmem_cell_get
+
+# required by rockchip-dfi.ko
+ devm_devfreq_event_add_edev
+ gic_nonsecure_priorities
+
+# required by rockchip.ko
+ __genphy_config_aneg
+ genphy_resume
+ genphy_soft_reset
+ genphy_suspend
+ mdiobus_read
+ mdiobus_write
+ phy_drivers_register
+ phy_drivers_unregister
+
+# required by rockchip_bus.ko
+ cpufreq_register_notifier
+ cpu_topology
+
+# required by rockchip_debug.ko
+ atomic_notifier_chain_unregister
+ nr_irqs
+ __per_cpu_offset
+
+# required by rockchip_dmc.ko
+ cpufreq_cpu_get
+ cpufreq_cpu_put
+ __cpufreq_driver_target
+ cpufreq_quick_get
+ cpu_latency_qos_add_request
+ cpu_latency_qos_update_request
+ cpu_number
+ cpus_read_lock
+ cpus_read_unlock
+ devfreq_add_governor
+ devfreq_event_disable_edev
+ devfreq_event_enable_edev
+ devfreq_event_get_edev_by_phandle
+ devfreq_event_get_edev_count
+ devfreq_event_get_event
+ devfreq_monitor_resume
+ devfreq_monitor_start
+ devfreq_monitor_stop
+ devfreq_monitor_suspend
+ devfreq_resume_device
+ devfreq_suspend_device
+ devfreq_update_interval
+ devm_devfreq_add_device
+ devm_devfreq_register_opp_notifier
+ _dev_notice
+ dev_pm_opp_put_regulators
+ dev_pm_opp_register_set_opp_helper
+ dev_pm_opp_set_rate
+ dev_pm_opp_set_regulators
+ dev_pm_opp_unregister_set_opp_helper
+ disable_irq
+ enable_irq
+ finish_wait
+ init_wait_entry
+ __init_waitqueue_head
+ input_close_device
+ input_open_device
+ input_register_handle
+ input_register_handler
+ input_unregister_handle
+ kstrtouint
+ __memset_io
+ of_devfreq_cooling_register_power
+ of_get_child_by_name
+ platform_get_irq_byname
+ prepare_to_wait_event
+ queue_work_on
+ ___ratelimit
+ schedule_timeout
+ __wake_up
+
+# required by rockchip_dmc_common.ko
+ down_write_trylock
+
+# required by rockchip_opp_select.ko
+ dev_pm_opp_disable
+ dev_pm_opp_of_add_table
+ dev_pm_opp_set_prop_name
+ of_find_node_opts_by_path
+ of_machine_is_compatible
+ regulator_get_linear_step
+ regulator_get_optional
+
+# required by rockchip_pm_config.ko
+ of_find_node_by_name
+ of_get_named_gpio_flags
+
+# required by rockchip_pvtm.ko
+ debugfs_create_dir
+ debugfs_create_file
+ debugfs_remove
+ seq_lseek
+ seq_printf
+ seq_puts
+ seq_read
+ single_open
+ single_release
+
+# required by rockchip_pwm_remotectl.ko
+ arm64_const_caps_ready
+ cpu_hwcap_keys
+ devm_input_allocate_device
+ input_event
+ input_register_device
+ input_set_capability
+ irq_set_affinity_hint
+ jiffies
+ jiffies_to_msecs
+ mod_timer
+ of_get_property
+ param_ops_int
+ __pm_relax
+ pm_wakeup_ws_event
+ __tasklet_hi_schedule
+ tasklet_init
+ wakeup_source_add
+ wakeup_source_remove
+
+# required by rockchip_saradc.ko
+ complete
+ devm_add_action
+ devm_iio_device_alloc
+ __devm_iio_device_register
+ __devm_reset_control_get
+ find_next_bit
+ iio_get_time_ns
+ iio_push_to_buffers
+ iio_trigger_notify_done
+ __init_swait_queue_head
+ wait_for_completion_timeout
+
+# required by rockchip_sip.ko
+ arm64_use_ng_mappings
+ __arm_smccc_smc
+ __ioremap
+ memstart_addr
+ pfn_valid
+ sched_clock
+ vmap
+
+# required by rockchip_system_monitor.ko
+ add_cpu
+ bitmap_parselist
+ blocking_notifier_call_chain
+ blocking_notifier_chain_register
+ blocking_notifier_chain_unregister
+ dev_pm_opp_find_freq_floor
+ dev_pm_qos_add_request
+ dev_pm_qos_remove_request
+ dev_pm_qos_update_request
+ freq_qos_add_request
+ freq_qos_remove_request
+ freq_qos_update_request
+ kobject_create_and_add
+ kstrdup
+ kstrtoull
+ __list_del_entry_valid
+ memset
+ mod_delayed_work_on
+ register_pm_notifier
+ register_reboot_notifier
+ regulator_get
+ remove_cpu
+ strchr
+ strsep
+ strstr
+ thermal_zone_get_temp
+
+# required by rockchip_thermal.ko
+ devm_pinctrl_get
+ devm_thermal_zone_of_sensor_register
+ pinctrl_lookup_state
+ pinctrl_select_state
+ thermal_zone_device_disable
+ thermal_zone_device_enable
+ thermal_zone_device_update
+
+# required by rtc-hym8563.ko
+ _bcd2bin
+ _bin2bcd
+ device_property_present
+ devm_rtc_device_register
+ i2c_del_driver
+ i2c_register_driver
+ i2c_smbus_read_byte_data
+ i2c_smbus_read_i2c_block_data
+ i2c_smbus_write_byte_data
+ i2c_smbus_write_i2c_block_data
+ rtc_valid_tm
+
+# required by timer-rockchip.ko
+ clockevents_config_and_register
+ irq_of_parse_and_map
+ of_device_is_compatible
+ request_threaded_irq