Merge "unzip: fix Mac build." am: 2ea7c7d39f am: 5a5ad6106d
am: 93efc1ea02

Change-Id: Iebfea83413cfed92a63e736a9eec58ab7a505506