Merge b8b13ebc25ae83d04a77c235eb1a0cedd00660bd on remote branch

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