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

Change-Id: I7cf621ad49afd892677cabd5c687e6b49d2896fc