Merge "Revert "Remove dead code from compiler driver."" am: 091f6754c3
am: dc36c19eeb

Change-Id: I5eea715bebb18525e57dd5bea8be07157e4e12d8