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

Change-Id: I78829b59b6cc4426f03f4c26b7cf63b9957c9de2