Merge "Replace libziparchive-host with libziparchive"
am: 091b631915

Change-Id: I4ee6244e8fc2fad0edd17be39cd275abbcf8e62d