Merge "Revert "Bluetooth-Wipower: Add compilation flag""