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

Change-Id: I5f7db638441e4760e80c9d42f70d19e987e0302a