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

Change-Id: Ibca636745a95a5f55bddfdd1a0c8067b9078655a