am e23c1dbf: am f9d22c3c: Merge "Solve compilation problem when BLE/GATT/SMP...
am e23c1dbf: am f9d22c3c: Merge "Solve compilation problem when BLE/GATT/SMP features are false" into jb-mr2-dev
* commit 'e23c1dbf':
Solve compilation problem when BLE/GATT/SMP features are false