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

Change-Id: Ic0b73fa49ef8b88c2e89740ce1dee71b7df2113e