Merge "Emulator: start logcat -Q as logd user instead of root"