Merge d1e63c2ec534bf9f310c1ff971006f4524ecf429 on remote branch

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