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

Change-Id: I185d5c965267bebe6bfd26b644c06460fc8bea32