Merge 957e5f7cde893885a914a8d51f465d9712ad2988 on remote branch

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