[coreboot-gerrit] Patch merged into coreboot/master: aa3f7ba cbfstool: Replace C++ code with C code