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

Change-Id: I679cc8db99cdb6e9e26ab36c23732e833b0b345e