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

Change-Id: Id5edb8980bee52e96adb2597910fbaf2e7ac4ef3