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

Change-Id: I70abaa872bdec404bf2abdc8ae91303a11695344