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