Merge "Support new socket schema in native codegen"