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

Change-Id: I5a0e67899361a1ac93618b12a3052c78da86b23f