Merge "Make fastboot host builds match adb."
am: b004620f80

Change-Id: Ie2d3fabc665b8cbba78b2382a8a77f92932f5be7