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

Change-Id: I3302bc87a7480765750fe73e8f37f177e51b3f8c