Merge a17a340ddd594ab125002b330a51860cb0943e20 on remote branch

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