Merge 1e6791a5f681b4abfe6e7bd0de5f038956c35764 on remote branch

Change-Id: I8e318eea3f3017531c3faa41a389885f7fcf75fb
tree: 4bb3ac8094115edba96798accd88cd56785d15b8
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/
  6. Android.bp
  7. Android.mk