Merge "libziparchive: fix mac os breakage" am: 390f3b364c
am: 7cfe1d69b0

Change-Id: I0f1367d9fad529c3a65d7d3e6dc65343c4826889