Merge "Fix missing update to -unknown-linux-musl" am: 0826482532 am: 67553ad5ec am: c603ec95e0

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

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