Merge 3e29a0c49e5052523050b4f794229c0bd4d24e61 on remote branch

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