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

Change-Id: I9be5ed8d3b4f9f90d37e4fd98d664e99dcf2c1fd