Add support for MAP Bluetooth (fix also build bluetooth problems)

Change-Id: I5c2056e72d86d752b30b23152ea0bed465d4e487