Merge "liblogcat: redirect logcat output correctly for -Q" am: 151fec4032
am: f2b62408b2

Change-Id: If045db1a428c44bf801c1602dd38bc2c10bc818a