Merge "fastboot: Don't leak file in error case" am: 3a197b3799
am: 0c8a67bbfd

Change-Id: I3939b2c4a64f2d9f6513850abf00e93a2b904648