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

Change-Id: Ic8cf6139665107692a7b74a15f51a3387a4fa3e7