Merge "Upgrade zlib to 898c6c0dd91fa0efb38a10949f76102e42cc47f0"