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

* commit '35b5a07958433498b453f1f8b8af0a449863a6dd':
  ZipWriter: archive disk numbers are 0 index based