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

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



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