Merge "Mark libziparchive vendor_available."
am: e0ee6d31fd

Change-Id: Ic414d368d7043083ce9cf9c09d124fb700ac8866