Merge "[codegen] Fix generation for files without end markers"