Merge 4ea040c03215b634baf23cd696f706d6110d72c6 on remote branch

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