Merge "zip_archive: Fix a few more badly written tests." am: 93d344d98c am: 000e0bfff4
am: 5c39aa53a9

Change-Id: Idc2e77fb2134f2935f04ed3756d84a36090995e1