Merge 3a5461f375c7ff0a98e07fe5aa892a3de131acca on remote branch

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