am: 47229aa5 * commit '47229aa5': Revert "Revert "Don't use the compiler driver for method resolution.""