Merge "fastboot: fix build break"