am 579b9299: (-s ours) Merge "Remove more dead code from minzip."

* commit '579b92991ccd626527c75042aca032d3ac4207a2':
  Remove more dead code from minzip.