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

Change-Id: I359a28e0a82ae7cb9e84ff8fe147c8f9baf87a86