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

Change-Id: Id6b022d5cb9e1a55aa4c321697cbb355d3338f2c