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

Change-Id: Iae79a5411d6f0a466f16b2a3d20ecb94292cb1f4