[automerger skipped] Revert "Fix ndk and aml arch order" am: f64377ca am:...

[automerger skipped] Revert "Fix ndk and aml arch order" am: f64377ca am: af2bfec7 -s ours am: 121b4c4f -s ours

am skip reason: Merged-In I33164a7e7c64a23f2cc1860acb24a2584f4dffad with SHA-1 5219c0e4 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15167731

Change-Id: I6c544a87a52be0408fcb33cc8378db4293625026