Merge changes from topic "musl_arm64" am: b3f28b2e am: 222511ff am: 4d392045 am: 32d2f8f3

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



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