Merge "Fix return type of CeeFormatter::format"