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

Change-Id: I0b49f1de822ab33685267b382c7892369d554440