Merge "Solve compilation problem when BLE/GATT/SMP features are false" into jb-mr2-dev