Merge remote-tracking branch 'aosp/upstream-master' am: b97a4ea5a1

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

Change-Id: I1a8e9c47d477d2c4342c785b490be0b7f99d7dab