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

Change-Id: Id8cf7e44fdcc59fff656a9fe9a5e7ff9c9d4466f