Fix CompilerDriver's handling of boot image extension. am: 96491e9db2
am: 7c3110b017

Change-Id: I8c8d2c08a0e6c69c8cdbc73d164fc4c5d5de414f