[automerger skipped] Revert^2 "Atest: move active targets to atest/Android.bp" am: 7435bef977 -s ours am: 5527d16a08 -s ours am: 60ad5b1eb0 -s ours am: 23e6ff76d4 -s ours

am skip reason: skipped by user chiayupei

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

Change-Id: I9e0848dd14dd69f1265c5865836f89b2a9e1010c