Merge "floss: Fix build breakages" am: 76e55632 am: 0d3ceb4b am:...

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

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



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