Merge \\\\"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\\\\" am: 3ba829c75c am: 6fb57f996a am: 8e9d75e378
am: 4f3abfa66b

Change-Id: I7c423a8861928468645761ff7b56113389859bf6