Merge cbc2e45613f0de25a695b0119947b3968083ef3b on remote branch

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