diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index c628304290ed..5a4225bc52ee 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -291792,6 +291792,14 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0xa9403390
 }
+function {
+  id: 0x360a8ce9
+  return_type_id: 0x33756485
+  parameter_id: 0x1d5bae2a
+  parameter_id: 0x33756485
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x360ab09d
   return_type_id: 0x0490bb4a
@@ -293814,6 +293822,11 @@ function {
   parameter_id: 0x11c404ba
   parameter_id: 0x11c404ba
 }
+function {
+  id: 0x59f18b0b
+  return_type_id: 0x1d5bae2a
+  parameter_id: 0xc93e017b
+}
 function {
   id: 0x59fab064
   return_type_id: 0x391f15ea
@@ -307316,6 +307329,13 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x2b16c036
 }
+function {
+  id: 0x9b04b788
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2b16c036
+  parameter_id: 0x1d5bae2a
+}
 function {
   id: 0x9b04f747
   return_type_id: 0x6720d32f
@@ -310360,6 +310380,12 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x0b3476b2
 }
+function {
+  id: 0x9bdad4db
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1d5bae2a
+}
 function {
   id: 0x9bdb4132
   return_type_id: 0x6720d32f
@@ -315468,6 +315494,12 @@ function {
   parameter_id: 0xd0b3a203
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9f4f3809
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0a85fcb6
+  parameter_id: 0x1ba902d8
+}
 function {
   id: 0x9f4f7dcd
   return_type_id: 0x6720d32f
@@ -325634,6 +325666,51 @@ elf_symbol {
   type_id: 0x9b6e7eec
   full_name: "__traceiter_android_vh_map_util_freq"
 }
+elf_symbol {
+  id: 0x1bfed9f9
+  name: "__traceiter_android_vh_mem_cgroup_alloc"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x695869bc
+  type_id: 0x9bdad4db
+  full_name: "__traceiter_android_vh_mem_cgroup_alloc"
+}
+elf_symbol {
+  id: 0x27757c9a
+  name: "__traceiter_android_vh_mem_cgroup_css_offline"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x59a3c0a3
+  type_id: 0x9b04b788
+  full_name: "__traceiter_android_vh_mem_cgroup_css_offline"
+}
+elf_symbol {
+  id: 0xb832c560
+  name: "__traceiter_android_vh_mem_cgroup_css_online"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xcc77b854
+  type_id: 0x9b04b788
+  full_name: "__traceiter_android_vh_mem_cgroup_css_online"
+}
+elf_symbol {
+  id: 0x96b60e0b
+  name: "__traceiter_android_vh_mem_cgroup_free"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x73d2ab43
+  type_id: 0x9bdad4db
+  full_name: "__traceiter_android_vh_mem_cgroup_free"
+}
+elf_symbol {
+  id: 0x3431d426
+  name: "__traceiter_android_vh_mem_cgroup_id_remove"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3800bd9c
+  type_id: 0x9bdad4db
+  full_name: "__traceiter_android_vh_mem_cgroup_id_remove"
+}
 elf_symbol {
   id: 0x8c174a7d
   name: "__traceiter_android_vh_meminfo_cache_adjust"
@@ -328676,6 +328753,51 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_map_util_freq"
 }
+elf_symbol {
+  id: 0x6377ba8b
+  name: "__tracepoint_android_vh_mem_cgroup_alloc"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x81f213a3
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mem_cgroup_alloc"
+}
+elf_symbol {
+  id: 0xe160b6f0
+  name: "__tracepoint_android_vh_mem_cgroup_css_offline"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xf342a420
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mem_cgroup_css_offline"
+}
+elf_symbol {
+  id: 0x37c5c41a
+  name: "__tracepoint_android_vh_mem_cgroup_css_online"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xacdf3a05
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mem_cgroup_css_online"
+}
+elf_symbol {
+  id: 0x78341cfd
+  name: "__tracepoint_android_vh_mem_cgroup_free"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x71b34ba2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mem_cgroup_free"
+}
+elf_symbol {
+  id: 0xac62c748
+  name: "__tracepoint_android_vh_mem_cgroup_id_remove"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x76f2ace1
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mem_cgroup_id_remove"
+}
 elf_symbol {
   id: 0xa2bd1edf
   name: "__tracepoint_android_vh_meminfo_cache_adjust"
@@ -333746,6 +333868,15 @@ elf_symbol {
   type_id: 0x1e99dfd1
   full_name: "cec_unregister_adapter"
 }
+elf_symbol {
+  id: 0x3c85cae0
+  name: "cgroup_add_legacy_cftypes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xee2ef857
+  type_id: 0x9f4f3809
+  full_name: "cgroup_add_legacy_cftypes"
+}
 elf_symbol {
   id: 0x4ce62869
   name: "cgroup_path_ns"
@@ -354282,6 +354413,15 @@ elf_symbol {
   type_id: 0x19ccd2d6
   full_name: "media_request_put"
 }
+elf_symbol {
+  id: 0x140f40dd
+  name: "mem_cgroup_from_id"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc9b28f7d
+  type_id: 0x59f18b0b
+  full_name: "mem_cgroup_from_id"
+}
 elf_symbol {
   id: 0x7f797603
   name: "mem_dump_obj"
@@ -372357,6 +372497,15 @@ elf_symbol {
   type_id: 0x920d63ce
   full_name: "try_to_del_timer_sync"
 }
+elf_symbol {
+  id: 0x8814f5b8
+  name: "try_to_free_mem_cgroup_pages"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5e9c8eb0
+  type_id: 0x360a8ce9
+  full_name: "try_to_free_mem_cgroup_pages"
+}
 elf_symbol {
   id: 0xe54aec5b
   name: "try_wait_for_completion"
@@ -380489,6 +380638,11 @@ interface {
   symbol_id: 0xa94ef105
   symbol_id: 0x0e1f9e23
   symbol_id: 0x61ea12b8
+  symbol_id: 0x1bfed9f9
+  symbol_id: 0x27757c9a
+  symbol_id: 0xb832c560
+  symbol_id: 0x96b60e0b
+  symbol_id: 0x3431d426
   symbol_id: 0x8c174a7d
   symbol_id: 0xe44dacb1
   symbol_id: 0x5612c9d1
@@ -380827,6 +380981,11 @@ interface {
   symbol_id: 0x2f768c2b
   symbol_id: 0xc34a5545
   symbol_id: 0x00a5fe5e
+  symbol_id: 0x6377ba8b
+  symbol_id: 0xe160b6f0
+  symbol_id: 0x37c5c41a
+  symbol_id: 0x78341cfd
+  symbol_id: 0xac62c748
   symbol_id: 0xa2bd1edf
   symbol_id: 0xb6da564f
   symbol_id: 0x41c8d09b
@@ -381391,6 +381550,7 @@ interface {
   symbol_id: 0xc4e53e95
   symbol_id: 0xba1a33c8
   symbol_id: 0xe2dc88d9
+  symbol_id: 0x3c85cae0
   symbol_id: 0x4ce62869
   symbol_id: 0x6d77f512
   symbol_id: 0xb3cbf3c8
@@ -383671,6 +383831,7 @@ interface {
   symbol_id: 0xd075c3be
   symbol_id: 0xa848deda
   symbol_id: 0x8eadb5fd
+  symbol_id: 0x140f40dd
   symbol_id: 0x7f797603
   symbol_id: 0x01e78001
   symbol_id: 0x746374fa
@@ -385680,6 +385841,7 @@ interface {
   symbol_id: 0x54bbaa46
   symbol_id: 0x3d986fb5
   symbol_id: 0x2f855953
+  symbol_id: 0x8814f5b8
   symbol_id: 0xe54aec5b
   symbol_id: 0xce4acc7b
   symbol_id: 0xe244df50
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index d9b34babe1d3..35b30f831c27 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -8,6 +8,7 @@
   blk_rq_map_user
   blk_rq_map_user_iov
   blk_start_plug
+  cgroup_add_legacy_cftypes
   console_printk
   cpufreq_frequency_table_get_index
   cpufreq_policy_transition_delay_us
@@ -39,6 +40,7 @@
   ktime_get_coarse_real_ts64
   memory_cgrp_subsys
   memory_cgrp_subsys_enabled_key
+  mem_cgroup_from_id
   mipi_dsi_generic_write
   mmc_wait_for_cmd
   nf_ct_attach
@@ -119,11 +121,16 @@
   __traceiter_android_vh_cgroup_set_task
   __traceiter_android_vh_dup_task_struct
   __traceiter_android_vh_exit_signal
+  __traceiter_android_vh_mem_cgroup_id_remove
+  __traceiter_android_vh_mem_cgroup_css_offline
+  __traceiter_android_vh_mem_cgroup_css_online
+  __traceiter_android_vh_mem_cgroup_free
+  __traceiter_android_vh_mem_cgroup_alloc
   __traceiter_android_vh_irqtime_account_process_tick
   __traceiter_android_vh_mutex_can_spin_on_owner
   __traceiter_android_vh_mutex_opt_spin_finish
   __traceiter_android_vh_mutex_opt_spin_start
-  __traceiter_android_vh_cpufreq_acct_update_power  
+  __traceiter_android_vh_cpufreq_acct_update_power
   __traceiter_android_vh_cleanup_old_buffers_bypass
   __traceiter_android_vh_dm_bufio_shrink_scan_bypass
   __traceiter_android_vh_mutex_unlock_slowpath
@@ -170,6 +177,11 @@
   __tracepoint_android_vh_do_futex
   __tracepoint_android_vh_dup_task_struct
   __tracepoint_android_vh_exit_signal
+  __tracepoint_android_vh_mem_cgroup_id_remove
+  __tracepoint_android_vh_mem_cgroup_css_offline
+  __tracepoint_android_vh_mem_cgroup_css_online
+  __tracepoint_android_vh_mem_cgroup_free
+  __tracepoint_android_vh_mem_cgroup_alloc
   __tracepoint_android_vh_futex_sleep_start
   __tracepoint_android_vh_futex_wait_end
   __tracepoint_android_vh_futex_wait_start
@@ -204,6 +216,7 @@
   __tracepoint_sched_stat_wait
   __tracepoint_sched_waking
   __tracepoint_task_rename
+  try_to_free_mem_cgroup_pages
   typec_mux_get_drvdata
   unregister_memory_notifier
   unregister_tcf_proto_ops