Merge "Upgrade zlib to 8cd0fc1ed5ea7b59e4df6428318043a8215254cc" am: b5461d1d89

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

Change-Id: Ia580cb6a89ee2ffc7417f0a6366a371cea7bf9ab