Merge tag 'v1.2.3' am: b35b2b1b68

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

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