Merge "ART: Remove libziparchive dependency"