Merge "Remove duplicate/unnecessary code from ClassLinker."