Merge 0b657515777ce10a4b7c0e92fe9f8e1a0fdb9f8d on remote branch

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