Merge "Show the "platform tools" version in adb/fastboot --version."
am: 6f4d47438d

Change-Id: I5ff109186b29b9770f61506eb4cfb99ce71db4e9