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

Change-Id: I077a18bc3e6de20e0d4d6d6213de829ea47ffe43