Merge 1267ec9e1336bbe8ab690f6afea4089799907bf9 on remote branch

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