Merge "Fix bad comment in class_linker"