Merge "Upgrade zlib to 7492de9a52f656b070f41968e39a6efa603590d5"