Merge "floss: use delete ctor and remove all base/macros.h includes" am:...

Merge "floss: use delete ctor and remove all base/macros.h includes" am: ed699dc3 am: 51743184 am: bcffcfce am: c37da07d

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

Change-Id: I2771fc1e3742759517c3291412d62b3fdcf80e3c