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

* commit 'e8693f06247dd769eaad614c5573163f1b890b2f':
  Fix class_linker_test for valgrind.