Merge "Remove architecture name from names of HOST_*.mk files." into main am:...

Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facd am: cd4c2622 am: 6311f5a3

Original change: https://android-review.googlesource.com/c/platform/build/+/2694564



Change-Id: Ib2a8f2b3a5015cc99b9ef00682a134fe60a669eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>