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

Change-Id: Ib7e882634636f74092487766f4abc8d969b0468a