Merge "Emulator: Enable logcat -Q to run in emulator"