Merge "ART: Remove libziparchive dependency"
am: e32a3c263f

Change-Id: I8ca9593a04e9c5e90c106ac57f1dcaeb506939ab