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

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



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