Merge "logd: improve logd prune" am: c02d05dc1c
am: 3a9935ee02

Change-Id: I0560401d07a62944acc751ac39f21d8c2e60b1a2