Merge "Refactor some tests to not use bp2build_avail" into main am: 92c59496...

Merge "Refactor some tests to not use bp2build_avail" into main am: 92c59496 am: 4bd587ec am: ac61ee07 am: 2a54365a am: af4ace0e

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



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