Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4 am: e3f28d26a6

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

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