Merge "Upgrade zlib to 8cd0fc1ed5ea7b59e4df6428318043a8215254cc"