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

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



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