Merge c2619454b9affc83ec0f301693409b1b6b092220 on remote branch

Change-Id: I86ecf88164422e663d3c3cfbb8621d7dd26cb952
tree: 1331160274b4aa430f678f9f6dfb948f7ea97119
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/