Merge "Remove more dead code from minzip."