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

Change-Id: I8e02c61c6838262f71de75a3aad47be37c8d5cb3