Merge "Give slightly less useless versions to adb and fastboot." am: ddfd5056a2
am: 77ca73f8a7

Change-Id: I0529c9d864ee74464d3a46d6184bbdc347a608ee