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

* commit 'fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7':
  Remove more dead code from minzip.