diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index f3b75195a4e3..0793a50488ac 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -3073,6 +3073,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x01d3d77e
 }
+pointer_reference {
+  id: 0x0aeaa065
+  kind: POINTER
+  pointee_type_id: 0x01ea670b
+}
 pointer_reference {
   id: 0x0aee7ba0
   kind: POINTER
@@ -12453,6 +12458,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xaf33de29
 }
+pointer_reference {
+  id: 0x2163ef30
+  kind: POINTER
+  pointee_type_id: 0xafcf5a5c
+}
 pointer_reference {
   id: 0x2170d06d
   kind: POINTER
@@ -24228,6 +24238,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe9917f17
 }
+pointer_reference {
+  id: 0x30f6da87
+  kind: POINTER
+  pointee_type_id: 0xe99b8c83
+}
 pointer_reference {
   id: 0x30fbef83
   kind: POINTER
@@ -34038,6 +34053,11 @@ typedef {
   name: "te1_settings"
   referred_type_id: 0x247e8a06
 }
+typedef {
+  id: 0x8d4bfd24
+  name: "tegra_bpmp_mrq_handler_t"
+  referred_type_id: 0x0aeaa065
+}
 typedef {
   id: 0x865acc96
   name: "time64_t"
@@ -36933,6 +36953,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xd659846e
 }
+qualified {
+  id: 0xe99b8c83
+  qualifier: CONST
+  qualified_type_id: 0xd6298487
+}
 qualified {
   id: 0xe9af5892
   qualifier: CONST
@@ -75170,6 +75195,11 @@ member {
   type_id: 0x391f15ea
   offset: 384
 }
+member {
+  id: 0xffab3b79
+  name: "data"
+  type_id: 0x391f15ea
+}
 member {
   id: 0xffab3bd2
   name: "data"
@@ -136901,6 +136931,11 @@ member {
   type_id: 0xebbaa9d5
   offset: 800
 }
+member {
+  id: 0x630c78f4
+  name: "mrq"
+  type_id: 0x4585663f
+}
 member {
   id: 0x6360d0b2
   name: "mrq"
@@ -174702,6 +174737,12 @@ member {
   type_id: 0x6720d32f
   offset: 192
 }
+member {
+  id: 0x51f16b6f
+  name: "ret"
+  type_id: 0x6720d32f
+  offset: 128
+}
 member {
   id: 0x51f63d7f
   name: "ret"
@@ -177392,6 +177433,12 @@ member {
   type_id: 0x3b007e79
   offset: 64
 }
+member {
+  id: 0x6cd7f7a7
+  name: "rx"
+  type_id: 0x27b8946e
+  offset: 192
+}
 member {
   id: 0xec2f95e2
   name: "rx_addr"
@@ -204157,6 +204204,12 @@ member {
   type_id: 0x2c3ef046
   offset: 128
 }
+member {
+  id: 0x65ff358a
+  name: "tx"
+  type_id: 0x27b0e88e
+  offset: 64
+}
 member {
   id: 0x562b2b94
   name: "tx16"
@@ -222539,6 +222592,25 @@ struct_union {
     member_id: 0xb84054d1
   }
 }
+struct_union {
+  id: 0x27b0e88e
+  kind: STRUCT
+  definition {
+    bytesize: 16
+    member_id: 0xffab3b79
+    member_id: 0xd98a2dfb
+  }
+}
+struct_union {
+  id: 0x27b8946e
+  kind: STRUCT
+  definition {
+    bytesize: 24
+    member_id: 0xff8a9909
+    member_id: 0xd98a2dfb
+    member_id: 0x51f16b6f
+  }
+}
 struct_union {
   id: 0x27bfa089
   kind: STRUCT
@@ -273976,6 +274048,18 @@ struct_union {
   kind: STRUCT
   name: "tegra_bpmp_clk"
 }
+struct_union {
+  id: 0xafcf5a5c
+  kind: STRUCT
+  name: "tegra_bpmp_message"
+  definition {
+    bytesize: 56
+    member_id: 0x630c78f4
+    member_id: 0x65ff358a
+    member_id: 0x6cd7f7a7
+    member_id: 0x2d5bf0a8
+  }
+}
 struct_union {
   id: 0xec7454a4
   kind: STRUCT
@@ -304573,6 +304657,13 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x07944f4b
 }
+function {
+  id: 0x01ea670b
+  return_type_id: 0x48b5725f
+  parameter_id: 0x4585663f
+  parameter_id: 0x05501385
+  parameter_id: 0x18bd6530
+}
 function {
   id: 0x01ecbbc0
   return_type_id: 0x48b5725f
@@ -305696,6 +305787,14 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x0ee0d5d1
 }
+function {
+  id: 0x105d412e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x05501385
+  parameter_id: 0x6720d32f
+  parameter_id: 0x391f15ea
+  parameter_id: 0xf435685e
+}
 function {
   id: 0x105fb374
   return_type_id: 0xd5cc9c9a
@@ -312483,6 +312582,13 @@ function {
   parameter_id: 0x25520d15
   parameter_id: 0x026c3dea
 }
+function {
+  id: 0x19c5ab78
+  return_type_id: 0x48b5725f
+  parameter_id: 0x213700a8
+  parameter_id: 0x4585663f
+  parameter_id: 0x18bd6530
+}
 function {
   id: 0x19c6594b
   return_type_id: 0x48b5725f
@@ -316681,6 +316787,11 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x1f202302
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3ee1ca44
+}
 function {
   id: 0x1f21f887
   return_type_id: 0xd5cc9c9a
@@ -324858,6 +324969,13 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x37cc6bab
 }
+function {
+  id: 0x907748a2
+  return_type_id: 0x6720d32f
+  parameter_id: 0x347303b4
+  parameter_id: 0x3aff5796
+  parameter_id: 0x0258f96e
+}
 function {
   id: 0x9077fd27
   return_type_id: 0x6720d32f
@@ -327920,6 +328038,11 @@ function {
   parameter_id: 0x3806390a
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x923891be
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3ee1ca44
+}
 function {
   id: 0x923af25c
   return_type_id: 0x6720d32f
@@ -327940,6 +328063,20 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x3ef6d4b8
 }
+function {
+  id: 0x923e40fa
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3ee1ca44
+  parameter_id: 0x0258f96e
+  parameter_id: 0x30f6da87
+  parameter_id: 0xe02e14d6
+  parameter_id: 0x30f6da87
+  parameter_id: 0xe02e14d6
+  parameter_id: 0x4585663f
+  parameter_id: 0xf435685e
+  parameter_id: 0x0d408c02
+  parameter_id: 0x18bd6530
+}
 function {
   id: 0x923e6d3f
   return_type_id: 0x6720d32f
@@ -328771,6 +328908,12 @@ function {
   parameter_id: 0x31c8b544
   parameter_id: 0xcd84e3cd
 }
+function {
+  id: 0x92c4f8dc
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3ee1ca44
+  parameter_id: 0x3f1a5886
+}
 function {
   id: 0x92c581e2
   return_type_id: 0x6720d32f
@@ -331196,6 +331339,14 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x25db57c0
 }
+function {
+  id: 0x94f80697
+  return_type_id: 0x6720d32f
+  parameter_id: 0x213700a8
+  parameter_id: 0x4585663f
+  parameter_id: 0x8d4bfd24
+  parameter_id: 0x18bd6530
+}
 function {
   id: 0x94f8a6cc
   return_type_id: 0x6720d32f
@@ -331424,6 +331575,12 @@ function {
   parameter_id: 0x27459bea
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x9548acb9
+  return_type_id: 0x6720d32f
+  parameter_id: 0x213700a8
+  parameter_id: 0x2163ef30
+}
 function {
   id: 0x954a5c30
   return_type_id: 0x6720d32f
@@ -354382,6 +354539,12 @@ function {
   parameter_id: 0x4faa9b63
   parameter_id: 0x1856a912
 }
+function {
+  id: 0xf7ff8eb6
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x213700a8
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xf806feb1
   return_type_id: 0x6d7f5ff6
@@ -375692,6 +375855,15 @@ elf_symbol {
   type_id: 0xfcb31d8f
   full_name: "blk_mq_sched_try_merge"
 }
+elf_symbol {
+  id: 0xd28f8ce5
+  name: "blk_mq_start_hw_queues"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe5b16473
+  type_id: 0x12c8ce83
+  full_name: "blk_mq_start_hw_queues"
+}
 elf_symbol {
   id: 0x96f2cda8
   name: "blk_mq_start_request"
@@ -375719,6 +375891,15 @@ elf_symbol {
   type_id: 0x181a6fb5
   full_name: "blk_mq_stop_hw_queue"
 }
+elf_symbol {
+  id: 0xd13a60aa
+  name: "blk_mq_stop_hw_queues"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x27dd6377
+  type_id: 0x12c8ce83
+  full_name: "blk_mq_stop_hw_queues"
+}
 elf_symbol {
   id: 0x37d3a115
   name: "blk_mq_tagset_busy_iter"
@@ -407873,6 +408054,15 @@ elf_symbol {
   type_id: 0x119fef8e
   full_name: "of_phy_simple_xlate"
 }
+elf_symbol {
+  id: 0x9c2bfa6b
+  name: "of_platform_default_populate"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfcdc9248
+  type_id: 0x907748a2
+  full_name: "of_platform_default_populate"
+}
 elf_symbol {
   id: 0x840bde05
   name: "of_platform_depopulate"
@@ -425393,6 +425583,123 @@ elf_symbol {
   type_id: 0x1f174592
   full_name: "tcpm_vbus_change"
 }
+elf_symbol {
+  id: 0xe54ea1f3
+  name: "tegra_bpmp_free_mrq"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xaf6bcfea
+  type_id: 0x19c5ab78
+  full_name: "tegra_bpmp_free_mrq"
+}
+elf_symbol {
+  id: 0xa2565005
+  name: "tegra_bpmp_mrq_is_supported"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc6b176d9
+  type_id: 0xf7ff8eb6
+  full_name: "tegra_bpmp_mrq_is_supported"
+}
+elf_symbol {
+  id: 0xfc2dbec4
+  name: "tegra_bpmp_mrq_return"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x223cf89d
+  type_id: 0x105d412e
+  full_name: "tegra_bpmp_mrq_return"
+}
+elf_symbol {
+  id: 0x08907db0
+  name: "tegra_bpmp_request_mrq"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4bd2db5c
+  type_id: 0x94f80697
+  full_name: "tegra_bpmp_request_mrq"
+}
+elf_symbol {
+  id: 0x81a07067
+  name: "tegra_bpmp_transfer"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf29da5b1
+  type_id: 0x9548acb9
+  full_name: "tegra_bpmp_transfer"
+}
+elf_symbol {
+  id: 0xb47ee8bd
+  name: "tegra_bpmp_transfer_atomic"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6737b43c
+  type_id: 0x9548acb9
+  full_name: "tegra_bpmp_transfer_atomic"
+}
+elf_symbol {
+  id: 0x07f159e7
+  name: "tegra_ivc_init"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x147021c7
+  type_id: 0x923e40fa
+  full_name: "tegra_ivc_init"
+}
+elf_symbol {
+  id: 0x94af2b02
+  name: "tegra_ivc_notified"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf425fd43
+  type_id: 0x923891be
+  full_name: "tegra_ivc_notified"
+}
+elf_symbol {
+  id: 0xa7d44351
+  name: "tegra_ivc_read_advance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd971c967
+  type_id: 0x923891be
+  full_name: "tegra_ivc_read_advance"
+}
+elf_symbol {
+  id: 0x8e08a107
+  name: "tegra_ivc_read_get_next_frame"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5f8dbfc9
+  type_id: 0x92c4f8dc
+  full_name: "tegra_ivc_read_get_next_frame"
+}
+elf_symbol {
+  id: 0xe19aecef
+  name: "tegra_ivc_reset"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x063d20ed
+  type_id: 0x1f202302
+  full_name: "tegra_ivc_reset"
+}
+elf_symbol {
+  id: 0xc746a415
+  name: "tegra_ivc_write_advance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x35f1975b
+  type_id: 0x923891be
+  full_name: "tegra_ivc_write_advance"
+}
+elf_symbol {
+  id: 0x175273e3
+  name: "tegra_ivc_write_get_next_frame"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd843aff5
+  type_id: 0x92c4f8dc
+  full_name: "tegra_ivc_write_get_next_frame"
+}
 elf_symbol {
   id: 0xa8f0fe44
   name: "tegra_mc_probe_device"
@@ -437946,9 +438253,11 @@ interface {
   symbol_id: 0x49ee3f1e
   symbol_id: 0x646a1dc6
   symbol_id: 0xc40c1fbe
+  symbol_id: 0xd28f8ce5
   symbol_id: 0x96f2cda8
   symbol_id: 0x1162870c
   symbol_id: 0x310e729f
+  symbol_id: 0xd13a60aa
   symbol_id: 0x37d3a115
   symbol_id: 0x9c9435eb
   symbol_id: 0x95bdba0c
@@ -441513,6 +441822,7 @@ interface {
   symbol_id: 0x783e3f26
   symbol_id: 0xeb2dab5b
   symbol_id: 0x5516ad40
+  symbol_id: 0x9c2bfa6b
   symbol_id: 0x840bde05
   symbol_id: 0x923f5818
   symbol_id: 0x41ba71c8
@@ -443459,6 +443769,19 @@ interface {
   symbol_id: 0xfccd15d1
   symbol_id: 0x591431f1
   symbol_id: 0x6869c83d
+  symbol_id: 0xe54ea1f3
+  symbol_id: 0xa2565005
+  symbol_id: 0xfc2dbec4
+  symbol_id: 0x08907db0
+  symbol_id: 0x81a07067
+  symbol_id: 0xb47ee8bd
+  symbol_id: 0x07f159e7
+  symbol_id: 0x94af2b02
+  symbol_id: 0xa7d44351
+  symbol_id: 0x8e08a107
+  symbol_id: 0xe19aecef
+  symbol_id: 0xc746a415
+  symbol_id: 0x175273e3
   symbol_id: 0xa8f0fe44
   symbol_id: 0xcb1a674c
   symbol_id: 0x7cfd9233
diff --git a/android/abi_gki_aarch64_nvidia b/android/abi_gki_aarch64_nvidia
index ab0937c4810f..2497126b8372 100644
--- a/android/abi_gki_aarch64_nvidia
+++ b/android/abi_gki_aarch64_nvidia
@@ -64,6 +64,12 @@
   sysfs_remove_group
   system_cpucaps
   system_wq
+  tegra_ivc_notified
+  tegra_ivc_read_advance
+  tegra_ivc_read_get_next_frame
+  tegra_ivc_reset
+  tegra_ivc_write_advance
+  tegra_ivc_write_get_next_frame
   __traceiter_rwmmio_post_read
   __traceiter_rwmmio_read
   __tracepoint_rwmmio_post_read
@@ -71,3 +77,156 @@
   unregister_chrdev_region
   __wake_up
   __warn_printk
+
+# required by ivc-cdev.ko
+  device_del
+  devm_free_irq
+  noop_llseek
+  remap_pfn_range
+
+# required by ivc_ext.ko
+  dma_sync_single_for_cpu
+  __memcpy_toio
+
+# required by nvsciipc.ko
+  _dev_notice
+  __fdget
+  find_get_pid
+  fput
+  platform_device_register_full
+  platform_device_unregister
+  sprintf
+
+# required by tegra_bpmp.ko
+  clk_hw_determine_rate_no_reparent
+  clk_hw_get_name
+  clk_hw_unregister
+  debugfs_create_dir
+  debugfs_create_file
+  debugfs_remove
+  dentry_path_raw
+  devm_clk_hw_register
+  devm_reset_controller_register
+  dma_alloc_attrs
+  dma_free_attrs
+  _find_next_bit
+  kmalloc_large
+  kstrdup
+  ktime_get
+  of_clk_add_hw_provider
+  of_device_get_match_data
+  of_genpd_add_provider_onecell
+  __of_parse_phandle_with_args
+  of_platform_default_populate
+  pm_genpd_init
+  pm_genpd_remove
+  seq_lseek
+  seq_read
+  seq_write
+  single_open_size
+  single_release
+  strncpy
+  tegra_bpmp_free_mrq
+  tegra_bpmp_mrq_is_supported
+  tegra_bpmp_mrq_return
+  tegra_bpmp_request_mrq
+  tegra_bpmp_transfer
+  tegra_bpmp_transfer_atomic
+  tegra_sku_info
+
+# required by tegra_hv.ko
+  arm64_use_ng_mappings
+  class_create_file_ns
+  ioremap_prot
+  iounmap
+  irq_get_irq_data
+  memstart_addr
+  of_add_property
+  of_chosen
+  of_find_compatible_node
+  of_irq_get
+  pfn_is_map_memory
+  tegra_ivc_init
+
+# required by tegra_hv_pm_ctl.ko
+  __alloc_skb
+  find_vpid
+  finish_wait
+  init_net
+  init_wait_entry
+  msleep
+  __netlink_kernel_create
+  netlink_unicast
+  __nlmsg_put
+  prepare_to_wait_event
+  register_pm_notifier
+  schedule
+  strcmp
+  wait_for_completion_timeout
+
+# required by tegra_hv_vblk_oops.ko
+  delayed_work_timer_fn
+  dma_map_page_attrs
+  __get_free_pages
+  is_vmalloc_addr
+  queue_delayed_work_on
+
+# required by tegra_vblk.ko
+  blk_execute_rq
+  blk_mq_alloc_disk_for_queue
+  blk_mq_alloc_request
+  blk_mq_alloc_tag_set
+  blk_mq_destroy_queue
+  blk_mq_end_request
+  blk_mq_free_request
+  blk_mq_free_tag_set
+  blk_mq_init_queue
+  blk_mq_start_hw_queues
+  blk_mq_start_request
+  blk_mq_stop_hw_queues
+  blk_queue_flag_set
+  blk_queue_logical_block_size
+  blk_queue_max_discard_sectors
+  blk_queue_max_hw_sectors
+  blk_queue_max_secure_erase_sectors
+  blk_queue_physical_block_size
+  blk_queue_write_cache
+  __blk_rq_map_sg
+  capable
+  __cpu_possible_mask
+  del_gendisk
+  device_add_disk
+  device_create_file
+  disable_irq
+  disk_check_media_change
+  dma_map_sg_attrs
+  dma_unmap_sg_attrs
+  enable_irq
+  _find_first_zero_bit
+  jiffies
+  kasan_flag_enabled
+  kthread_create_on_cpu
+  kthread_create_on_node
+  __list_add_valid_or_report
+  __list_del_entry_valid_or_report
+  mod_timer
+  __num_online_cpus
+  of_find_node_by_name
+  put_disk
+  queue_work_on
+  _raw_spin_lock_irqsave
+  _raw_spin_unlock_irqrestore
+  __register_blkdev
+  sched_setattr_nocheck
+  set_capacity
+  set_disk_ro
+  sg_init_table
+  sg_nents
+  __sw_hweight64
+  timer_delete
+  unregister_blkdev
+  vfree
+  vzalloc
+  wait_for_completion
+  wait_for_completion_interruptible
+  wake_up_process