Merge changes from topic "musl_arm64" am: b3f28b2e am: 222511ff am:...

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

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



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