am 5bb601a8: Merge "Clean up formatting in class linker"

* commit '5bb601a8df9e4ded065fc266e0e5727debea2d8b':
  Clean up formatting in class linker