Merge "Remove an ancient spam-busting hack from logd." am: e05c799c47
am: b0bfb3bb07

Change-Id: I57019a259c7a83e8e1de0d09a568e63ee5162eb3