Merge "logcat: logcatd: make logcatd killable" am: f2c1ef53ff
am: 69f28a69e3

Change-Id: I4a75c92ea0c23f2c00be5cf0ebaed768f354ae4f