am b14b958d: am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"

* commit 'b14b958d166adfe902cb64335820db9cc839d42e':