Merge tag 'v1.2.3' am: b35b2b1b68 am: a97cc34c2c am: 8304e972db am: 32adf9c2be am: 11c1cc8f50

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

Change-Id: Ib17c07eca1f8365de41cc93229ad19a6078fbdcb
Signed-off-by: Automerger Merge Worker <[email protected]>