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

Change-Id: I8e94dfef723cd7c2f798b8fc11a529a01d03b7a9