Merge "Revert "Revert "Remove dead code from compiler driver."""
am: dd58cb7451

Change-Id: I877d6316fe9fdf418f657d7a08b0e48c58e2b0ba