Merge "Always include the adb version in the log."