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

Change-Id: I17375152b9e0157dca08e392ba634cfe7ee12b17