Merge "Fix logcatd dependency in logpersist."