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

Change-Id: I587cd7f6b016560ed1ae139ba7efceea9239987a