Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a" into oc-dev-plus-aosp