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

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



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