Merge 838704206c80716e0cd25322ae4b2c32970b94bf on remote branch

Change-Id: Id7aabb8fe73c0e172b124553a3113414c7918eae
tree: 97dc7157178b033d9ee687a29c37c67155a27b63
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/