Merge "Fix fuzzer build." into main