Merge d6fdbe6f9e9b247c5cf41a82079c3015f6f83a56 on remote branch

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