Merge "Refactor method resolution in class linker." am: 86f452c179 am: bdfd9c1093
am: 6084a1af90

Change-Id: I46e1d7b26439f774762759fe17c982ae35c4445a