Merge a39de114f0ce6d73ed1e84582c0f66b227fb9d6e on remote branch

Change-Id: Ib64927bbe7b43551d6e6f6179f67b460fd7ba093
tree: 50812f05f9d192b16b1d87c68ce247e23eaf64a1
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/