Merge "Upgrade zlib to cf333892c34ab6dbaed37c38a1d5aa6da7b2f99d"