Merge "Add libziparchive-based unzip." am: 3e67944d2e
am: 3cd4306ea2

Change-Id: I091fe18bb661a190b06ac6e884f285ebc9063dd6