[automerger skipped] Merge "Remove vendor Wifi and BT entries from fs_config.cpp" into pi-dev
am: 587004c48b  -s ours

Change-Id: I40d8b3331dac4c92d5d943d39473d31e0dff41c0