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

Change-Id: I1bc5d9183e116819c4e92ed6f29e63936a334740