Merge "floss: Fix build breakages" am: 76e55632 am: 0d3ceb4b am: b78abe20 am: 31c14642

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



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