am 531a2eac: Merge "Clean up bluetooth le feature file" into jb-mr2-dev

* commit '531a2eacfa783efd1e28b65b4700e11aff0225d1':
  Clean up bluetooth le feature file