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

Change-Id: Ib4160d75ed147685ccb57e11a274410018e1ad20