Merge 17080a4e0c49bf8ac354113f2974b866d6a24bd0 on remote branch

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