Merge "Emulator: Enable logcat -Q to run in emulator" am: 406d3b6df1
am: 5c8080cc18

Change-Id: I594e895cd1170501227ac030e07981a49c4a3aee