Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master
am: 42d194ee03

Change-Id: I1836f523463d004ed7c6f9f907c5c11d3fb086e2