Merge 1deb497aec7e41336aa76a5a8213de5dd68e6459 on remote branch

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