Merge remote-tracking branch 'aosp/upstream-master' am: 5a3eaeb9f2 am: b898de302e

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

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