am 2fb00423: Merge "Always include the adb version in the log."

* commit '2fb00423d4760b36c5c991afe6789d26bf20cc70':
  Always include the adb version in the log.