Merge "Revert "Fix non-determinism in prebuilt selection"" into main am: 5354483c am: 1e981074

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



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