am acc00214: am d5673e47: Merge "Fix bad comment in class_linker"

* commit 'acc002142003e2b3598d18c0dd6a9bf91cf76e13':
  Fix bad comment in class_linker