Clean up a couple of structures during retry

Avoid keeping some structures too long during retry.

Test: unit tests
run retry --retry 0
Bug: 119436395

Change-Id: I430b87eaf47c5fc74b5156e8fefaecfed94a83ff
2 files changed
tree: 1b10b48afa7b8b93b66ca21ae997df46184ca483
  1. build/
  2. common/
  3. tools/
  4. OWNERS
  5. PREUPLOAD.cfg
  6. test_defs.sh