Merge ad56adf46fc36c2c647ddb7e9f6bc8d557baaee3 on remote branch

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