Merge "Framework: Add libziparchive dependency"
am: 2688a9ab56

Change-Id: I68c353e8784c86b4a1e1e38c3c2f65e79bd7920a