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

Change-Id: Icb13126e99d6c78a53a33974af9dd14aeb9dfe61