Merge "Fix build error on darwin_arm64" am: 4f6c061cee am: 41bdef98b1

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

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