am 51c4550a: Merge "Remove duplicate/unnecessary code from ClassLinker."

* commit '51c4550a96ff62003d5fc1df25626f578f7b7111':
  Remove duplicate/unnecessary code from ClassLinker.