Merge "unzip: fix Mac build."
am: 2ea7c7d39f

Change-Id: Iac8f373dd786c2cd875bd71e14e593f90f66ae72