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

Change-Id: Ib19541aa9b1a18764bfe631a5b0c5bfd7b13a285