Fix zip logic to work with multiple files per trace changes

Test: Upload archive, download all as archive, and reupload and check all files are always there.
Change-Id: Ic9a80bbcc3ff165015d7fa585289cefe926a88c6
23 files changed