Merge "[codegen] Support nested classes"