Merge "logpersist: bundle with logcatd service"