Merge a98bf70f30c6a22d34e3a37f7606f6bd001d234f on remote branch

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