Revert "Remove duplication between CommonTestUtils and HostSideTestUtils" am: c91abc0f66
am: 9b807729c4

Change-Id: I6065b40a491a15778829863805ca9d0ca0cc4332
tree: fad514ef9977cfd0bf2d02bc34fea8e9a5cfacda
  1. build/
  2. common/
  3. tools/
  4. OWNERS
  5. PREUPLOAD.cfg
  6. test_defs.sh