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

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

Change-Id: I2b2b23a49969c32f1e6e66883b7b2b54b84c5995