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