Merge "Fix logcatd dependency in logpersist." am: d0406316fe am: 8b03fd8441
am: 808c8ca352

Change-Id: Ie2cf5ba632d7a30e98f47b45bc11116660ed80d2