Merge be1ab4154689cc6f2f0431f9208a1817529083dc on remote branch

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