Merge "liblogcat: redirect logcat output correctly for -Q"