diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index e0fe061ca8af..998bdf9a14c2 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -309739,6 +309739,11 @@ function {
   parameter_id: 0x21003da7
   parameter_id: 0x31b5a66f
 }
+function {
+  id: 0x636e6c75
+  return_type_id: 0x38b136d3
+  parameter_id: 0x2309ad3e
+}
 function {
   id: 0x637004ab
   return_type_id: 0x1582ab06
@@ -321853,6 +321858,12 @@ function {
   parameter_id: 0x295c7202
   parameter_id: 0x295c7202
 }
+function {
+  id: 0x98d422e6
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1a1051a0
+  parameter_id: 0xf435685e
+}
 function {
   id: 0x98d70f54
   return_type_id: 0x3e10b518
@@ -324161,6 +324172,12 @@ function {
   parameter_id: 0x1fba7d3d
   parameter_id: 0x3e5d9ebb
 }
+function {
+  id: 0x9a98740b
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1a1051a0
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9a9d1e6d
   return_type_id: 0xf435685e
@@ -330758,6 +330775,13 @@ function {
   parameter_id: 0x01222f7d
   parameter_id: 0x33756485
 }
+function {
+  id: 0x9d0b24c4
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0258f96e
+  parameter_id: 0x0490bb4a
+  parameter_id: 0x3eed77c0
+}
 function {
   id: 0x9d0be11c
   return_type_id: 0x6720d32f
@@ -336285,6 +336309,12 @@ function {
   parameter_id: 0x21003da7
   parameter_id: 0x2ef43f67
 }
+function {
+  id: 0xab542ea9
+  return_type_id: 0xfc0e1dbd
+  parameter_id: 0x3e10b518
+  parameter_id: 0xfc0e1dbd
+}
 function {
   id: 0xab7dda53
   return_type_id: 0x0258f96e
@@ -343604,6 +343634,15 @@ elf_symbol {
   type_id: 0x10985193
   full_name: "__rcu_read_unlock"
 }
+elf_symbol {
+  id: 0x13092e7f
+  name: "__read_overflow2_field"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5092e84e
+  type_id: 0x2e45de25
+  full_name: "__read_overflow2_field"
+}
 elf_symbol {
   id: 0x41303eac
   name: "__refrigerator"
@@ -378753,6 +378792,15 @@ elf_symbol {
   type_id: 0x100e6fc8
   full_name: "iommu_fwspec_free"
 }
+elf_symbol {
+  id: 0x3741ce6e
+  name: "iommu_fwspec_init"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x78d83fe5
+  type_id: 0x9d0b24c4
+  full_name: "iommu_fwspec_init"
+}
 elf_symbol {
   id: 0x29d25600
   name: "iommu_get_domain_for_dev"
@@ -388626,6 +388674,15 @@ elf_symbol {
   type_id: 0x04ce0b6f
   full_name: "pci_find_ext_capability"
 }
+elf_symbol {
+  id: 0x780d1110
+  name: "pci_find_host_bridge"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x99e774a9
+  type_id: 0x636e6c75
+  full_name: "pci_find_host_bridge"
+}
 elf_symbol {
   id: 0xdea420f5
   name: "pci_find_next_capability"
@@ -402887,6 +402944,15 @@ elf_symbol {
   binding: WEAK
   crc: 0xa916b694
 }
+elf_symbol {
+  id: 0x15088b5c
+  name: "strnlen_user"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x31fb1f0a
+  type_id: 0xab542ea9
+  full_name: "strnlen_user"
+}
 elf_symbol {
   id: 0xbf5ecdb4
   name: "strnstr"
@@ -405532,6 +405598,24 @@ elf_symbol {
   type_id: 0x14b4088f
   full_name: "ttm_tt_unpopulate"
 }
+elf_symbol {
+  id: 0x01afa7bb
+  name: "tty_buffer_request_room"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x83a33d3f
+  type_id: 0x98d422e6
+  full_name: "tty_buffer_request_room"
+}
+elf_symbol {
+  id: 0x3ffae0cf
+  name: "tty_buffer_set_limit"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3ff82ada
+  type_id: 0x9a98740b
+  full_name: "tty_buffer_set_limit"
+}
 elf_symbol {
   id: 0x0b4dd20d
   name: "tty_chars_in_buffer"
@@ -414532,6 +414616,7 @@ interface {
   symbol_id: 0x431cc4ee
   symbol_id: 0x56eb7c27
   symbol_id: 0x72b8a9cf
+  symbol_id: 0x13092e7f
   symbol_id: 0x41303eac
   symbol_id: 0x73fde903
   symbol_id: 0x55970cc0
@@ -418436,6 +418521,7 @@ interface {
   symbol_id: 0xdf5bc8be
   symbol_id: 0x836fd42d
   symbol_id: 0x07d8752d
+  symbol_id: 0x3741ce6e
   symbol_id: 0x29d25600
   symbol_id: 0x79945ddc
   symbol_id: 0xc359a46e
@@ -419533,6 +419619,7 @@ interface {
   symbol_id: 0x3852868c
   symbol_id: 0x27f20808
   symbol_id: 0x63876663
+  symbol_id: 0x780d1110
   symbol_id: 0xdea420f5
   symbol_id: 0x08190210
   symbol_id: 0x8ffabaa9
@@ -421118,6 +421205,7 @@ interface {
   symbol_id: 0x544af8d3
   symbol_id: 0x0ab31bef
   symbol_id: 0x457e09db
+  symbol_id: 0x15088b5c
   symbol_id: 0xbf5ecdb4
   symbol_id: 0x8f344cc6
   symbol_id: 0x123ab6a2
@@ -421412,6 +421500,8 @@ interface {
   symbol_id: 0x6c2259cd
   symbol_id: 0xacf009d6
   symbol_id: 0xcbabaff3
+  symbol_id: 0x01afa7bb
+  symbol_id: 0x3ffae0cf
   symbol_id: 0x0b4dd20d
   symbol_id: 0xae3ac3f6
   symbol_id: 0xa7c71d5a
diff --git a/android/abi_gki_aarch64_bcmstb b/android/abi_gki_aarch64_bcmstb
index 0376d93363c3..eeebe6121c52 100644
--- a/android/abi_gki_aarch64_bcmstb
+++ b/android/abi_gki_aarch64_bcmstb
@@ -147,6 +147,7 @@
   dma_map_sg_attrs
   dma_set_coherent_mask
   dma_set_mask
+  dma_sync_single_for_device
   dma_unmap_page_attrs
   dma_unmap_sg_attrs
   do_trace_netlink_extack
@@ -188,6 +189,7 @@
   get_net_ns_by_fd
   get_net_ns_by_pid
   get_random_bytes
+  get_zeroed_page
   gic_nonsecure_priorities
   gpiochip_add_data_with_key
   gpiochip_find
@@ -415,6 +417,7 @@
   phy_start
   phy_stop
   phy_trigger_machine
+  platform_device_put
   platform_device_register_full
   platform_device_unregister
   __platform_driver_probe
@@ -783,7 +786,6 @@
   dma_sync_single_for_cpu
   of_get_ethdev_address
   of_platform_populate
-  platform_get_irq_byname
   __skb_pad
   synchronize_irq
 
@@ -863,6 +865,23 @@
   of_find_net_device_by_node
   of_find_node_by_phandle
 
+# required by brcmstb-iommu.ko
+  devm_get_free_pages
+  generic_device_group
+  iommu_device_register
+  iommu_device_sysfs_add
+  iommu_device_sysfs_remove
+  iommu_device_unlink
+  iommu_device_unregister
+  iommu_fwspec_init
+  iommu_group_alloc
+  iommu_group_put
+  iommu_group_ref_get
+  iommu_group_set_name
+  pci_device_group
+  pci_find_host_bridge
+  platform_get_irq_byname
+
 # required by brcmstb-proc-info.ko
   find_get_pid
   generic_file_open
@@ -1075,7 +1094,6 @@
   platform_device_add_data
   platform_device_add_resources
   platform_device_alloc
-  platform_device_put
   softnet_data
 
 # required by gpio-brcmstb.ko
@@ -1594,7 +1612,6 @@
   dma_get_slave_caps
   dma_release_channel
   dma_request_chan
-  dma_sync_single_for_device
   empty_zero_page
   gpiochip_request_own_desc
   __of_get_address
@@ -1689,7 +1706,6 @@
   device_find_child_by_name
   device_for_each_child
   _find_first_zero_bit
-  get_zeroed_page
   rtnl_configure_link
   rtnl_create_link
 
@@ -1751,3 +1767,11 @@
 # required by bstm.ko
   phys_mem_access_prot
   generic_access_phys
+
+# required by bcm_astra.ko
+  strnlen_user
+  tty_buffer_set_limit
+  tty_buffer_request_room
+
+# required by bcm_athena.ko
+  __read_overflow2_field