Merge "Replace libziparchive-host with libziparchive"