Merge c60878ab2f2a14f54d6dad434c19198aed8efa38 on remote branch

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