Merge "Upgrade zlib to 2c183c9f93a328bfb3121284da13cf89a0f7e64a"