Merge "Logcatd: remove some extra logic"