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

Change-Id: Ie561f8aa0fd6b7f114ee1c86bf94656f1310daab