Merge "Fix class_linker_test for valgrind."
am: 4a582f864c

* commit '4a582f864c10fce33fe9ba632aefc5e656280bc2':
  Fix class_linker_test for valgrind.