Merge "Revert "Revert "Don't use the compiler driver for method resolution."""