Merge tag 'v1.2.3' am: b35b2b1b68 am: a97cc34c2c am: 8304e972db

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

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