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

Change-Id: I4d42a5c0564f7d142b1ee3fe8606b4bd6371e9a9