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

Change-Id: I23b13d708cffe44f5016b85dd0820c27097daa44