Merge "Support Darwin+Arm64" am: 098486d2de am: 9af9a2579e

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1863968

Change-Id: I643f3214bdd43b3eb344350c9a25dac092c6184c