Merge "Enable Soong's tradefed_binary to support multi-arch" into main am: 453afad7

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



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