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

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



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