Merge "Switch mkbootfs to C++." into main