Merge IA32 .dsc & X64 .dsc into single bareBoot.dsc

PcdFirwareVendor commented out for a while. Will be fixed in next commit