Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4"