Merge 69984d2fdd43525322aa9401016366b0e4d22e06 on remote branch

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