Merge "Replace libziparchive-host with libziparchive" am: 0641c2b483 am: 4a90ce1880
am: 24bdbe3fa5

Change-Id: Id5f69c0bbe0c188ae3be0c27184ceba14b65ecd1