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

* commit '90a2f03bdd206dc5821b7d35eaa20f60305c50f3':
  ZipWriter: archive disk numbers are 0 index based