Merge "Make fastboot host builds match adb."