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

Change-Id: I6cd7aac2390a7fbc27cd7528381ee2c154ce430a