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

Change-Id: I3e3a49fb45d5387af675e8d7b20974796d3ee962