Merge "Replace libziparchive-host with libziparchive" am: 611e205bbe
am: 8c8bb25089

Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb