diff --git a/abi_gki_aarch64 b/android/abi_gki_aarch64
similarity index 100%
rename from abi_gki_aarch64
rename to android/abi_gki_aarch64
diff --git a/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
similarity index 100%
rename from abi_gki_aarch64.xml
rename to android/abi_gki_aarch64.xml
diff --git a/abi_gki_aarch64_cuttlefish b/android/abi_gki_aarch64_cuttlefish
similarity index 100%
rename from abi_gki_aarch64_cuttlefish
rename to android/abi_gki_aarch64_cuttlefish
diff --git a/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
similarity index 100%
rename from abi_gki_aarch64_qcom
rename to android/abi_gki_aarch64_qcom
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index d84cfe6bd5d9..832f53656f82 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -2,11 +2,11 @@
 . ${ROOT_DIR}/common/build.config.aarch64
 . ${ROOT_DIR}/common/build.config.gki
 
-ABI_DEFINITION=abi_gki_aarch64.xml
-KMI_WHITELIST=abi_gki_aarch64
+ABI_DEFINITION=android/abi_gki_aarch64.xml
+KMI_WHITELIST=android/abi_gki_aarch64
 ADDITIONAL_KMI_WHITELISTS="
-abi_gki_aarch64_cuttlefish
-abi_gki_aarch64_qcom
+android/abi_gki_aarch64_cuttlefish
+android/abi_gki_aarch64_qcom
 "
 TRIM_NONLISTED_KMI=1
 KMI_WHITELIST_STRICT_MODE=1