Merge adaaf08fdfff510d456acf8fa50c4cae9eb92a1f on remote branch

Change-Id: Ie50b8f3a5025e2f96c721bf184f9ab3aca570e57
tree: d5f5a647e942f868447b17918da4083a673244b1
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/