Merge "Upgrade zlib to 8cd0fc1ed5ea7b59e4df6428318043a8215254cc" am: b5461d1d89 am: d5e1c71732

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

Change-Id: Id14f8c493e50ef444a546ba4f97a333f7c72e9f3