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

Change-Id: Ib70a9b8861e4d527979f777fd5e81e4839ab7039