Merge "fastboot: use filename instead of fd to generate filesystem image" am: 010f7714b7
am: 104470da0f

Change-Id: I3e1e72bffe47188f49ae3cf4f0cfa44fcd9b0ef4