Revert^2 "Asute: cleanup tools/tradefederation/core in atest" am: 5f10e1829a

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

Change-Id: I07c9a11dd4565de3898a842cabe31df7c767b560