Merge "logcat: clean up handling of logd control commands with -f and -L"