Merge 889b726a68e42329140fedabeaeeee35248baf55 on remote branch

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