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

Change-Id: I98f7f8b4411407f7a8103ff95c5fd9878c0c955d