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

Change-Id: I5f81256ca1c6c957322dcef8777f69cbfa1d61b7