Merge 06ab6e4b1603c03a9e2b12907279607a08236e92 on remote branch

Change-Id: Id296bcd0c03b99ec2b7e351d20d0ea1bbbb2650f
tree: 6cb0d8ebb2cb0d78db762916ff83f7a316c7a188
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/