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

Change-Id: I69dd9a61da181859728812ba6c3e4d124837e697