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

Change-Id: I14e89f8165a449948bc77edd02ae29d603901d04