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

am skip reason: skipped by user jimtang

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

Change-Id: Ie5511feea94e9256da1ea822f9fb1163da098ac7