am 96f1b63a: am 44210dfe: Merge "logpersist: bundle with logcatd service"

* commit '96f1b63a916a86774780bc9e15ac857ac3dd6fde':
  logpersist: bundle with logcatd service