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

Change-Id: Ibe90cb4b11dca305d4136d1bb9317b6c505a2c15