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

Change-Id: Ia08c9bcf58e09e6d9aadd09b4b74aff462d5e97b