ANDROID: GKI: move abi files to android/

It's good to move the abi files out of the root kernel directory, so
move them to android/ to make it obvious these are add-on things, not
anything that is upstream.

Bug: 155573384
Cc: Matthias Maennich <maennich@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9f6c2269a1c4e8e4233971adc805cb7584d455f9
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_db845c b/android/abi_gki_aarch64_db845c
similarity index 100%
rename from abi_gki_aarch64_db845c
rename to android/abi_gki_aarch64_db845c
diff --git a/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos
similarity index 100%
rename from abi_gki_aarch64_exynos
rename to android/abi_gki_aarch64_exynos
diff --git a/abi_gki_aarch64_goldfish b/android/abi_gki_aarch64_goldfish
similarity index 100%
rename from abi_gki_aarch64_goldfish
rename to android/abi_gki_aarch64_goldfish
diff --git a/abi_gki_aarch64_hikey960 b/android/abi_gki_aarch64_hikey960
similarity index 100%
rename from abi_gki_aarch64_hikey960
rename to android/abi_gki_aarch64_hikey960
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/abi_gki_aarch64_sunxi b/android/abi_gki_aarch64_sunxi
similarity index 100%
rename from abi_gki_aarch64_sunxi
rename to android/abi_gki_aarch64_sunxi
diff --git a/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc
similarity index 100%
rename from abi_gki_aarch64_unisoc
rename to android/abi_gki_aarch64_unisoc
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 2ea771f..983c5ff 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -2,17 +2,17 @@
 . ${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_db845c
-abi_gki_aarch64_exynos
-abi_gki_aarch64_goldfish
-abi_gki_aarch64_hikey960
-abi_gki_aarch64_qcom
-abi_gki_aarch64_sunxi
-abi_gki_aarch64_unisoc
+android/abi_gki_aarch64_cuttlefish
+android/abi_gki_aarch64_db845c
+android/abi_gki_aarch64_exynos
+android/abi_gki_aarch64_goldfish
+android/abi_gki_aarch64_hikey960
+android/abi_gki_aarch64_qcom
+android/abi_gki_aarch64_sunxi
+android/abi_gki_aarch64_unisoc
 "
 TRIM_NONLISTED_KMI=1
 KMI_WHITELIST_STRICT_MODE=1