Merge "Use a better arbitrary target arch for this host-only "device"." am:...

Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36e am: f9915e13

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



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