Merge "Build arm and arm64 sysroots when building for musl"