Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d."