Merge "Upgrade zlib to 8cd0fc1ed5ea7b59e4df6428318043a8215254cc" am: b5461d1d89 am: d5e1c71732 am: e7e5513df6 am: 5a38f60479

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

Change-Id: I8b51b3cc6ed029b424a62475b7a601769bfd80d1