Merge "Remove vendor Wifi and BT entries from fs_config.cpp"
am: 09daaa4991

Change-Id: I1cb1ad321ca55785cff45a4fb677b105b92bbf7f