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

Change-Id: I2cf9c57789b96f7f9f2d13d7a4b0ad5bc3144b4b