Merge "ZipWriter: archive disk numbers are 0 index based"
am: 25322eeddd

* commit '25322eedddb833d923a3eb8339ef11a1558aecdb':
  ZipWriter: archive disk numbers are 0 index based