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

Change-Id: I536f55c07406084e4311fe9ede4ae6c1511fe04c