Merge "Revert "Update zlib to 1.2.11""