Revert^2 "Fix CompilerDriver's handling of boot image extension."
am: a879bdf5e9

Change-Id: I3cd0d0586d056da69f3cc5c3cba0deccf9d46f0b