Merge "fastboot: bail out if failed to generate fs image" am: 6aab4e2ca5
am: 80aec12072

Change-Id: I85027ce44bf57c646d4e358f2a33170c5d6a31d9