Merge "Mark libziparchive vendor_available." into oc-dev am: b8c0f4fb04  -s ours
am: 32d9f13645  -s ours

Change-Id: I4897c9595727be09f88cf122b28d40be3aec0918