Merge "fastboot: fix build break"
am: cce381e307

Change-Id: I1492e940fff923a979d957d9ca1d51ecffdb6492