Merge "Upgrade zlib to 3cec0573" am: 48c4ce50

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



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