Merge "Drop cmdgoals special case from prebuilt selection" into main am: 8e7c6454 am: 151043cc

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



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