Merge changes from topic "musl-arm" am: b256f3f39a am: ac5b6be874 am: bdf454d434 am: 90562508ab am: 392d53ccd2

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2125696

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