Merge "Upgrade zlib to d866d41e" am: 5adc3bd3 am: 21a808a4

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



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