Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a am: f3ee8c601a am: 22be453293"