[automerger skipped] Merge "Set the dist dir for musl targets of...

[automerger skipped] Merge "Set the dist dir for musl targets of build_version_test" am: f7fa021b am: 705d009f -s ours am: bda9d0c9 -s ours

am skip reason: Merged-In I29b7f4c16346e39b89f099eecf816d9811a7b587 with SHA-1 92e3e4fb is already in history

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



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