Merge remote-tracking branch 'aosp/upstream-master' am: b97a4ea5a1 am: 3c1717114a am: 7551d4f69d

Original change: https://android-review.googlesource.com/c/platform/external/musl/+/1748944

Change-Id: I8297aed5b354103258135dec421060a8d37c581e