Merge "Ziparchive: Give tests a test config" am: cd67fa9c1a
am: 3a5dc38aea

Change-Id: I1f1bf7b0a510ded10fe5696db8c5896a91b9ffdf