Revert "Fix CompilerDriver's handling of boot image extension." am: 96d8585ebb
am: 916ee84996

Change-Id: I18dac389df98c2e05d0bc5c29d89077bd4b1a92b