Merge "Remove vendor Wifi and BT entries from fs_config.cpp"