Merge ad94afeeb2d996e0525e674fda3c532995a9a20b on remote branch

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