[automerger skipped] Revert^2 "Atest: move active targets to atest/Android.bp" am: 7435bef977 am: 6dc4bebc21 -s ours

am skip reason: skipped by user jimtang

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

Change-Id: I756e4cfa237735b6ea9ef08bb922199a997fc025