Merge 43df8e3cf4c766ad801a3151da940c2700590a50 on remote branch

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