[coreboot-gerrit] Patch merged into coreboot/master: intel/braswell: Build in both C0 and 'other' vbios