Merge "Revert "floss: Refactor build for bt_common tests"" am: 1d33c5b0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2105005



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