Merge "fastboot: Fix "fastboot gsi"."
am: b7062df8c0

Change-Id: I1e9e050eace8e3a03ead0a77be34694548113c26