base

am 8234ed70: am fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev

* commit '8234ed70cb8b009845a9b0e974e7fdfb1eefafeb':
  Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.