Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea am:...

Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea am: 5d9a8574 am: 4065592b am: 4bee3b2e

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



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