[automerger skipped] Revert "Asute: cleanup tools/tradefederation/core in atest" am: f79afff627 am: 31d200bb16 -s ours am: 7a0bfa513b -s ours am: a59765cd73 -s ours

am skip reason: Merged-In Ib36637298c4d5fdeb7baf36fb0bf37a6a1b23162 with SHA-1 d8e6bb0f99 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/asuite/+/16182949

Change-Id: I23bddc21723965fac99f58b4b71a41a85f334e40