diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 67b187ae0a83..7142911bdc25 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -2993,6 +2993,7 @@
       <elf-symbol name='media_entity_pads_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x744b735'/>
       <elf-symbol name='media_entity_remote_pad' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe6f06077'/>
       <elf-symbol name='media_entity_remove_links' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc05c23c9'/>
+      <elf-symbol name='media_entity_setup_link' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x38a478f'/>
       <elf-symbol name='media_graph_walk_cleanup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbaa670a1'/>
       <elf-symbol name='media_graph_walk_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x17ac12d2'/>
       <elf-symbol name='media_graph_walk_next' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2c3cb6d9'/>
@@ -80964,9 +80965,6 @@
         <parameter type-id='cd1b45ab'/>
         <return type-id='3f1a6b60'/>
       </function-type>
-      <array-type-def dimensions='1' type-id='e151255a' size-in-bits='131072' id='b9cedcb8'>
-        <subrange length='2048' type-id='7ff19f0f' id='e5323efb'/>
-      </array-type-def>
       <function-type size-in-bits='64' id='b9d8dce4'>
         <parameter type-id='807b7702'/>
         <parameter type-id='95e97e5e'/>
@@ -89747,9 +89745,6 @@
       <pointer-type-def type-id='c9196d18' size-in-bits='64' id='cba10b6e'/>
       <pointer-type-def type-id='4b7a84f4' size-in-bits='64' id='cba114b6'/>
       <pointer-type-def type-id='284260b8' size-in-bits='64' id='cba1f2de'/>
-      <array-type-def dimensions='1' type-id='e151255a' size-in-bits='65536' id='cba3052b'>
-        <subrange length='1024' type-id='7ff19f0f' id='c60446f8'/>
-      </array-type-def>
       <function-type size-in-bits='64' id='cba59087'>
         <parameter type-id='eaa32e2f'/>
         <parameter type-id='91ce1af9'/>
@@ -102800,20 +102795,7 @@
           <var-decl name='branch_reg' type-id='a80839c0' visibility='default' filepath='include/linux/perf_event.h' line='148' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='can_dev_rcv_lists' size-in-bits='196928' is-struct='yes' visibility='default' filepath='include/linux/can/can-ml.h' line='55' column='1' id='e82476af'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='rx' type-id='fc3a8480' visibility='default' filepath='include/linux/can/can-ml.h' line='56' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='rx_sff' type-id='b9cedcb8' visibility='default' filepath='include/linux/can/can-ml.h' line='57' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='131328'>
-          <var-decl name='rx_eff' type-id='cba3052b' visibility='default' filepath='include/linux/can/can-ml.h' line='58' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='196864'>
-          <var-decl name='entries' type-id='95e97e5e' visibility='default' filepath='include/linux/can/can-ml.h' line='59' column='1'/>
-        </data-member>
-      </class-decl>
+      <class-decl name='can_dev_rcv_lists' is-struct='yes' visibility='default' is-declaration-only='yes' id='e82476af'/>
       <function-type size-in-bits='64' id='e82a9f1d'>
         <parameter type-id='77e79a4b'/>
         <parameter type-id='eaa32e2f'/>
@@ -129350,6 +129332,11 @@
         <parameter type-id='19e05b5f' name='entity' filepath='drivers/media/mc/mc-entity.c' line='792' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='media_entity_setup_link' mangled-name='media_entity_setup_link' filepath='drivers/media/mc/mc-entity.c' line='876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='media_entity_setup_link'>
+        <parameter type-id='b4de78ea' name='link' filepath='drivers/media/mc/mc-entity.c' line='876' column='1'/>
+        <parameter type-id='19c2251e' name='flags' filepath='drivers/media/mc/mc-entity.c' line='876' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='media_graph_walk_cleanup' mangled-name='media_graph_walk_cleanup' filepath='drivers/media/mc/mc-entity.c' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='media_graph_walk_cleanup'>
         <parameter type-id='375e0126' name='graph' filepath='drivers/media/mc/mc-entity.c' line='288' column='1'/>
         <return type-id='48b5725f'/>
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 6763edef48d7..d2a2cad1d6cf 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -12,7 +12,9 @@
   arm64_const_caps_ready
   arm64_use_ng_mappings
   __arm_smccc_smc
+  atomic_notifier_call_chain
   atomic_notifier_chain_register
+  atomic_notifier_chain_unregister
   bdget_disk
   bdput
   __bitmap_set
@@ -400,6 +402,7 @@
   __kfifo_alloc
   __kfifo_free
   __kfifo_in
+  __kfifo_out
   kfree
   kfree_const
   __kmalloc
@@ -431,8 +434,17 @@
   __log_write_mmio
   lzo1x_decompress_safe
   media_create_pad_link
+  media_device_init
+  __media_device_register
+  media_device_unregister
   media_entity_pads_init
   media_entity_remote_pad
+  media_graph_walk_cleanup
+  media_graph_walk_init
+  media_graph_walk_next
+  media_graph_walk_start
+  media_pipeline_start
+  media_pipeline_stop
   memcpy
   memdup_user
   memset
@@ -499,7 +511,9 @@
   panic_notifier_list
   param_ops_bool
   param_ops_int
+  param_ops_string
   param_ops_uint
+  PDE_DATA
   __per_cpu_offset
   pfn_valid
   phy_configure
@@ -547,6 +561,7 @@
   prepare_to_wait_event
   print_hex_dump
   printk
+  proc_create_data
   put_device
   put_disk
   __put_page
@@ -558,9 +573,11 @@
   ___ratelimit
   rational_best_approximation
   _raw_spin_lock
+  _raw_spin_lock_bh
   _raw_spin_lock_irq
   _raw_spin_lock_irqsave
   _raw_spin_unlock
+  _raw_spin_unlock_bh
   _raw_spin_unlock_irq
   _raw_spin_unlock_irqrestore
   rdev_get_drvdata
@@ -598,6 +615,7 @@
   regulator_set_voltage_sel_regmap
   regulator_set_voltage_time_sel
   remap_pfn_range
+  remove_proc_entry
   reset_control_assert
   reset_control_deassert
   revalidate_disk_size
@@ -666,6 +684,7 @@
   strlcpy
   strlen
   strncmp
+  strncpy
   strnlen
   strscpy
   strstr
@@ -699,6 +718,7 @@
   uuid_null
   v4l2_async_notifier_cleanup
   v4l2_async_notifier_init
+  v4l2_async_notifier_register
   v4l2_async_register_subdev
   v4l2_async_subdev_notifier_register
   v4l2_async_unregister_subdev
@@ -709,15 +729,54 @@
   v4l2_ctrl_handler_setup
   v4l2_ctrl_new_std
   v4l2_ctrl_new_std_menu_items
+  v4l2_device_register
+  v4l2_device_register_subdev
+  __v4l2_device_register_subdev_nodes
+  v4l2_device_unregister
+  v4l2_device_unregister_subdev
+  v4l2_event_queue
+  v4l2_event_subdev_unsubscribe
+  v4l2_event_subscribe
+  v4l2_fh_open
   v4l2_i2c_subdev_init
+  v4l2_pipeline_pm_get
+  v4l2_pipeline_pm_put
   v4l2_querymenu
   v4l2_subdev_call_wrappers
   v4l2_subdev_init
+  v4l2_subdev_link_validate
+  v4l2_type_names
   vabits_actual
+  vb2_buffer_done
   vb2_common_vm_ops
   vb2_create_framevec
   vb2_destroy_framevec
+  vb2_dma_contig_memops
+  vb2_fop_mmap
+  vb2_fop_poll
+  vb2_fop_release
+  vb2_ioctl_create_bufs
+  vb2_ioctl_dqbuf
+  vb2_ioctl_expbuf
+  vb2_ioctl_prepare_buf
+  vb2_ioctl_qbuf
+  vb2_ioctl_querybuf
+  vb2_ioctl_reqbufs
+  vb2_ioctl_streamoff
+  vb2_ioctl_streamon
+  vb2_ops_wait_finish
+  vb2_ops_wait_prepare
+  vb2_plane_cookie
+  vb2_plane_vaddr
+  vb2_queue_init
+  vb2_queue_release
+  vb2_vmalloc_memops
   vfree
+  video_devdata
+  video_device_release_empty
+  video_ioctl2
+  __video_register_device
+  video_unregister_device
   vmalloc
   vmap
   vm_get_page_prot
@@ -945,8 +1004,6 @@
   mmc_regulator_set_vqmmc
   mmc_remove_host
   mmc_request_done
-  _raw_spin_lock_bh
-  _raw_spin_unlock_bh
   sdio_signal_irq
   sg_miter_next
   sg_miter_start
@@ -1106,7 +1163,6 @@
   devm_gpio_request_one
 
 # required by ledtrig-heartbeat.ko
-  atomic_notifier_chain_unregister
   avenrun
 
 # required by lzo-rle.ko
@@ -1330,7 +1386,6 @@
   wakeup_source_remove
 
 # required by phy-rockchip-inno-usb3.ko
-  atomic_notifier_call_chain
   strcasecmp
   usb_add_phy
 
@@ -1854,7 +1909,6 @@
   power_supply_register
   power_supply_unregister
   strncasecmp
-  strncpy
 
 # required by tps65132-regulator.ko
   regulator_set_active_discharge_regmap
@@ -1873,70 +1927,19 @@
   v4l2_async_notifier_add_subdev
   v4l2_async_notifier_unregister
 
+# required by video_rkcif.ko
+  media_entity_setup_link
+
 # required by video_rkisp.ko
-  __kfifo_out
   kmalloc_order_trace
   media_device_cleanup
-  media_device_init
-  __media_device_register
-  media_device_unregister
-  media_graph_walk_cleanup
-  media_graph_walk_init
-  media_graph_walk_next
-  media_graph_walk_start
-  media_pipeline_start
-  media_pipeline_stop
   __memcpy_fromio
   __memcpy_toio
   of_property_read_u64
-  param_ops_string
   param_ops_ullong
-  PDE_DATA
-  proc_create_data
-  remove_proc_entry
-  v4l2_async_notifier_register
   v4l2_ctrl_g_ctrl_int64
-  v4l2_device_register
-  v4l2_device_register_subdev
-  __v4l2_device_register_subdev_nodes
-  v4l2_device_unregister
-  v4l2_device_unregister_subdev
-  v4l2_event_queue
-  v4l2_event_subdev_unsubscribe
-  v4l2_event_subscribe
   v4l2_event_unsubscribe
-  v4l2_fh_open
   v4l2_pipeline_link_notify
-  v4l2_pipeline_pm_get
-  v4l2_pipeline_pm_put
-  v4l2_subdev_link_validate
-  v4l2_type_names
-  vb2_buffer_done
-  vb2_dma_contig_memops
-  vb2_fop_mmap
-  vb2_fop_poll
-  vb2_fop_release
-  vb2_ioctl_create_bufs
-  vb2_ioctl_dqbuf
-  vb2_ioctl_expbuf
-  vb2_ioctl_prepare_buf
-  vb2_ioctl_qbuf
-  vb2_ioctl_querybuf
-  vb2_ioctl_reqbufs
-  vb2_ioctl_streamoff
-  vb2_ioctl_streamon
-  vb2_ops_wait_finish
-  vb2_ops_wait_prepare
-  vb2_plane_cookie
-  vb2_plane_vaddr
-  vb2_queue_init
-  vb2_queue_release
-  vb2_vmalloc_memops
-  video_devdata
-  video_device_release_empty
-  video_ioctl2
-  __video_register_device
-  video_unregister_device
 
 # required by videobuf2-dma-sg.ko
   split_page