diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm-generic/bitsperlong.h b/ndk/platforms/android-9/arch-arm64/include/asm-generic/bitsperlong.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm-generic/bitsperlong.h rename to ndk/platforms/android-9/arch-arm64/include/asm-generic/bitsperlong.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm-generic/int-ll64.h b/ndk/platforms/android-9/arch-arm64/include/asm-generic/int-ll64.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm-generic/int-ll64.h rename to ndk/platforms/android-9/arch-arm64/include/asm-generic/int-ll64.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm-generic/posix_types.h b/ndk/platforms/android-9/arch-arm64/include/asm-generic/posix_types.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm-generic/posix_types.h rename to ndk/platforms/android-9/arch-arm64/include/asm-generic/posix_types.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm-generic/signal-defs.h b/ndk/platforms/android-9/arch-arm64/include/asm-generic/signal-defs.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm-generic/signal-defs.h rename to ndk/platforms/android-9/arch-arm64/include/asm-generic/signal-defs.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm-generic/signal.h b/ndk/platforms/android-9/arch-arm64/include/asm-generic/signal.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm-generic/signal.h rename to ndk/platforms/android-9/arch-arm64/include/asm-generic/signal.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm-generic/types.h b/ndk/platforms/android-9/arch-arm64/include/asm-generic/types.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm-generic/types.h rename to ndk/platforms/android-9/arch-arm64/include/asm-generic/types.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/bitsperlong.h b/ndk/platforms/android-9/arch-arm64/include/asm/bitsperlong.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/bitsperlong.h rename to ndk/platforms/android-9/arch-arm64/include/asm/bitsperlong.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/errno.h b/ndk/platforms/android-9/arch-arm64/include/asm/errno.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/errno.h rename to ndk/platforms/android-9/arch-arm64/include/asm/errno.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/fcntl.h b/ndk/platforms/android-9/arch-arm64/include/asm/fcntl.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/fcntl.h rename to ndk/platforms/android-9/arch-arm64/include/asm/fcntl.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/page.h b/ndk/platforms/android-9/arch-arm64/include/asm/page.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/page.h rename to ndk/platforms/android-9/arch-arm64/include/asm/page.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/posix_types.h b/ndk/platforms/android-9/arch-arm64/include/asm/posix_types.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/posix_types.h rename to ndk/platforms/android-9/arch-arm64/include/asm/posix_types.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/sigcontext.h b/ndk/platforms/android-9/arch-arm64/include/asm/sigcontext.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/sigcontext.h rename to ndk/platforms/android-9/arch-arm64/include/asm/sigcontext.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/siginfo.h b/ndk/platforms/android-9/arch-arm64/include/asm/siginfo.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/siginfo.h rename to ndk/platforms/android-9/arch-arm64/include/asm/siginfo.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/signal.h b/ndk/platforms/android-9/arch-arm64/include/asm/signal.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/signal.h rename to ndk/platforms/android-9/arch-arm64/include/asm/signal.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/asm/types.h b/ndk/platforms/android-9/arch-arm64/include/asm/types.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/asm/types.h rename to ndk/platforms/android-9/arch-arm64/include/asm/types.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/machine/_types.h b/ndk/platforms/android-9/arch-arm64/include/machine/_types.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/machine/_types.h rename to ndk/platforms/android-9/arch-arm64/include/machine/_types.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/machine/endian.h b/ndk/platforms/android-9/arch-arm64/include/machine/endian.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/machine/endian.h rename to ndk/platforms/android-9/arch-arm64/include/machine/endian.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/machine/exec.h b/ndk/platforms/android-9/arch-arm64/include/machine/exec.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/machine/exec.h rename to ndk/platforms/android-9/arch-arm64/include/machine/exec.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/machine/kernel.h b/ndk/platforms/android-9/arch-arm64/include/machine/kernel.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/machine/kernel.h rename to ndk/platforms/android-9/arch-arm64/include/machine/kernel.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/machine/limits.h b/ndk/platforms/android-9/arch-arm64/include/machine/limits.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/machine/limits.h rename to ndk/platforms/android-9/arch-arm64/include/machine/limits.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/sys/limits.h b/ndk/platforms/android-9/arch-arm64/include/sys/limits.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/sys/limits.h rename to ndk/platforms/android-9/arch-arm64/include/sys/limits.h diff --git a/ndk/platforms/android-9/arch-aarch64/include/sys/types.h b/ndk/platforms/android-9/arch-arm64/include/sys/types.h similarity index 100% rename from ndk/platforms/android-9/arch-aarch64/include/sys/types.h rename to ndk/platforms/android-9/arch-arm64/include/sys/types.h