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

Change-Id: Ib7cfaa61a86729ae9767315c9e962cf252bd0854