Merge "logcat: tests: deal with -v threadtime default"