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

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

Change-Id: Iaaa9b2e5e11dd7026c58f85250d2ef171efa473a