diff --git a/android/abi_gki_aarch64 b/android/abi_gki_aarch64
new file mode 100644
index 000000000000..57914f291962
--- /dev/null
+++ b/android/abi_gki_aarch64
@@ -0,0 +1,4 @@
+[abi_symbol_list]
+# commonly used symbols
+  module_layout
+  __put_task_struct
diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/build.config.common b/build.config.common
index 870ffbf45ca6..c4ab942bfe66 100644
--- a/build.config.common
+++ b/build.config.common
@@ -12,4 +12,4 @@ STOP_SHIP_TRACEPRINTK=1
 IN_KERNEL_MODULES=1
 DO_NOT_STRIP_MODULES=1
 
-HERMETIC_TOOLCHAIN=1
+HERMETIC_TOOLCHAIN=${HERMETIC_TOOLCHAIN:-1}
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 8f0dcdb3bd2b..1623c686865f 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -2,3 +2,10 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
+KMI_SYMBOL_LIST=android/abi_gki_aarch64
+ADDITIONAL_KMI_SYMBOL_LISTS="
+"
+
+TRIM_NONLISTED_KMI=1
+KMI_SYMBOL_LIST_STRICT_MODE=1
+MODULES_ORDER=android/gki_aarch64_modules