Merge "ZipWriter: archive disk numbers are 0 index based"