Merge "fastboot: fix build break" am: cce381e307
am: 2cbce3739b

Change-Id: Ia6333f699fee3c67fa5f425cc42a871a8408fccb