Merge "Clean up bluetooth le feature file" into jb-mr2-dev