Merge "Make ziparchive-tests run standalone."