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

Change-Id: Id0d1c39cfcebabdc2735c2dbb57b34656f48fc5e