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

Change-Id: I694c150dc2d944d2adf0f2972e82b3c227843438