Merge "Remove dead code from compiler driver."
am: eebe142e93

Change-Id: Ic7aebf11851cc6706b6cd3a99cb013eeda850544