Merge "Fix build error on darwin_arm64" am: 4f6c061cee am: 41bdef98b1 am: 16b2cf1d54 am: 24afd915f4

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2539036

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