Merge "Emulator: enhance logcat -Q to handle qemu pipe device" am: a14b5bbd2c
am: 1284bbbb52

Change-Id: I81a4558f9381c2442fd291ed63546f64b13065f5