Merge c09c6078f0be5e0655d79af1acc3c1036beb712d on remote branch

Change-Id: I95bf264815368832fbd83ab9c6f7b4e5079f7391
tree: 87126696b01ae05c5821662849972ce2f92f6551
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/