Merge "Revert "Revert "Remove dead code from compiler driver.""" am: dd58cb7451 am: 9fe4969138
am: 5c12632559

Change-Id: I52e70e8c606c6f7055655699acd68a64d3d448da