Merge "add a performance benchmark for libziparchive" am: f8e96ea2d1 am: 48a6049eca
am: 8b44403ad6

Change-Id: Ib389678a5692faefff82077fb1af2835a9660661