Merge "Fix class_linker_test to take into account default methods." am: 009a195c55
am: fc1052715b

* commit 'fc1052715b54b3e0e1cf16a4972c1ccee77ca62e':
  Fix class_linker_test to take into account default methods.