Merge "logcat: clean up handling of logd control commands with -f and -L" am: 1dd1056f5d
am: 38a53d25e0

Change-Id: I88f66dabd24fc1e7d919327e2cbb5c2cbecdce2d