Merge e8d9d38cb7a7830dacdc31e12b6d5bace02280ca on remote branch

Change-Id: I5433e7c2658bb48d6c116ca89ceade63bc5b0eb1
tree: 86b3524de3d7a04bba39957ce56750ad38a05266
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/
  6. Android.mk