Merge 80a697968adbbe157998a4ea6efcafdea41b2e48 on remote branch

Change-Id: I406223e05cfde7a73a713bb60c7ee40828528834
tree: 31d9a1383886ed1b3f5dc757f5309963bc6e2163
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/