Merge "logcat: logcatd: make logcatd killable"