Merge "Build arm and arm64 sysroots when building for musl" am: 60a3074d3e

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2132286

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