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

Change-Id: I07c255e41e056cfd1146cdbcc384b13eeceb00c8