Merge "Update paths to musl sysroots to include full clang triple" am: 79027c8b90 am: c39af24a24 am: dd5275d788

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

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