Merge "Mark libziparchive vendor_available." am: e0ee6d31fd
am: 55a59f9906

Change-Id: Ie9439e0165583696d63f3453e352a52dcfd02cc2