Merge 80a697968adbbe157998a4ea6efcafdea41b2e48 on remote branch

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