am d5673e47: Merge "Fix bad comment in class_linker"

* commit 'd5673e47000fcfe8ff8f4df4329a842d4096c226':
  Fix bad comment in class_linker