Revert^2 "Asute: cleanup tools/tradefederation/core in atest" am: 5f10e1829a am: 6acfcd6b6b am: 9d8c59c638 am: 9474dae2ae

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

Change-Id: I8fd4f65c1d4b51f9b18dbf8f96ed614322d43f45