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

Change-Id: Ia41e72ae4c21b060b9a104a10f4628d24195d915