diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index a1b689f73ea7..32d8ddb657b7 100755
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -556,6 +556,7 @@
       <elf-symbol name='amba_driver_unregister' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x79525c69'/>
       <elf-symbol name='amba_release_regions' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x282efeff'/>
       <elf-symbol name='amba_request_regions' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8623af6f'/>
+      <elf-symbol name='android_debug_for_each_module' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1840ff6f'/>
       <elf-symbol name='android_debug_per_cpu_symbol' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8ee3d8d9'/>
       <elf-symbol name='android_debug_symbol' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9fd75310'/>
       <elf-symbol name='android_rvh_probe_register' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7fbbd0bb'/>
@@ -55172,6 +55173,7 @@
         <parameter type-id='fc4f83c1'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <pointer-type-def type-id='f0798262' size-in-bits='64' id='841286fc'/>
       <function-type size-in-bits='64' id='84147814'>
         <parameter type-id='7a5054b7'/>
         <parameter type-id='144a5d4c'/>
@@ -67553,7 +67555,14 @@
           <var-decl name='android_oem_data1' type-id='91ce1af9' visibility='default' filepath='include/net/sock.h' line='535' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='unicode_map' is-struct='yes' visibility='default' is-declaration-only='yes' id='a24978a1'/>
+      <class-decl name='unicode_map' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/unicode.h' line='8' column='1' id='a24978a1'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='charset' type-id='80f4b756' visibility='default' filepath='include/linux/unicode.h' line='9' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='version' type-id='95e97e5e' visibility='default' filepath='include/linux/unicode.h' line='10' column='1'/>
+        </data-member>
+      </class-decl>
       <function-type size-in-bits='64' id='a249930e'>
         <parameter type-id='b9608bfc'/>
         <parameter type-id='8efea9e5'/>
@@ -101754,6 +101763,12 @@
         <enumerator name='SND_SOC_BIAS_PREPARE' value='2'/>
         <enumerator name='SND_SOC_BIAS_ON' value='3'/>
       </enum-decl>
+      <function-type size-in-bits='64' id='f0798262'>
+        <parameter type-id='80f4b756'/>
+        <parameter type-id='eaa32e2f'/>
+        <parameter type-id='eaa32e2f'/>
+        <return type-id='95e97e5e'/>
+      </function-type>
       <typedef-decl name='mm_segment_t' type-id='7359adad' filepath='arch/arm64/include/asm/thread_info.h' line='21' column='1' id='f079b4db'/>
       <pointer-type-def type-id='016b3662' size-in-bits='64' id='f07d90b4'/>
       <function-type size-in-bits='64' id='f089a11b'>
@@ -111269,6 +111284,11 @@
         <parameter type-id='80f4b756' name='name' filepath='drivers/amba/bus.c' line='797' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='android_debug_for_each_module' mangled-name='android_debug_for_each_module' filepath='kernel/module.c' line='4792' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='android_debug_for_each_module'>
+        <parameter type-id='841286fc' name='fn' filepath='kernel/module.c' line='4792' column='1'/>
+        <parameter type-id='eaa32e2f' name='data' filepath='kernel/module.c' line='4793' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='android_debug_per_cpu_symbol' mangled-name='android_debug_per_cpu_symbol' filepath='drivers/android/debug_symbols.c' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='android_debug_per_cpu_symbol'>
         <parameter type-id='06dde89f' name='symbol' filepath='drivers/android/debug_symbols.c' line='110' column='1'/>
         <return type-id='eaa32e2f'/>
@@ -122830,12 +122850,12 @@
         <parameter type-id='7359adad' name='expires' filepath='kernel/time/timer.c' line='1084' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='module_layout' mangled-name='module_layout' filepath='kernel/module.c' line='4794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='module_layout'>
-        <parameter type-id='2730d015' name='mod' filepath='kernel/module.c' line='4794' column='1'/>
-        <parameter type-id='3a498c74' name='ver' filepath='kernel/module.c' line='4795' column='1'/>
-        <parameter type-id='a7c6e908' name='kp' filepath='kernel/module.c' line='4796' column='1'/>
-        <parameter type-id='eefd7061' name='ks' filepath='kernel/module.c' line='4797' column='1'/>
-        <parameter type-id='e525e121' name='tp' filepath='kernel/module.c' line='4798' column='1'/>
+      <function-decl name='module_layout' mangled-name='module_layout' filepath='kernel/module.c' line='4811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='module_layout'>
+        <parameter type-id='2730d015' name='mod' filepath='kernel/module.c' line='4811' column='1'/>
+        <parameter type-id='3a498c74' name='ver' filepath='kernel/module.c' line='4812' column='1'/>
+        <parameter type-id='a7c6e908' name='kp' filepath='kernel/module.c' line='4813' column='1'/>
+        <parameter type-id='eefd7061' name='ks' filepath='kernel/module.c' line='4814' column='1'/>
+        <parameter type-id='e525e121' name='tp' filepath='kernel/module.c' line='4815' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='module_put' mangled-name='module_put' filepath='include/linux/module.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='module_put'>
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index d39aebce8bea..8ca81bf4b4b3 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -31,6 +31,7 @@
   amba_bustype
   amba_driver_register
   amba_driver_unregister
+  android_debug_for_each_module
   android_debug_per_cpu_symbol
   android_debug_symbol
   android_rvh_probe_register