Merge b560846c1872bba40b68acdcee6c97745ef6d190 on remote branch

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