Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main...

Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main am: 0da2fee8 am: e5748d79

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



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