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

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

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



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