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

Change-Id: I2eb068104418f26bba5d414f52487667dce21729