Merge "Remove extra test targets from inside build script" into main am: 7ecb46b3 am: 2dca73d8

Original change: https://android-review.googlesource.com/c/platform/build/+/3002466



Change-Id: I8c8727867a1bc3908d7a9c7169d2bd4f3b89e37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>