Merge "unzip: fix Mac build."