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

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

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



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