Merge "Emulator: start logcat -Q as logd user instead of root" am: 6fc52b4ef9 am: e87326d436
am: c09187b8b6

Change-Id: I96b5060b2d3c99891fd57e9256402140df289e50