Merge "logd: improve logd prune"