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

Change-Id: I3a964569fa96eba1d3c8815b0831bbe7031b1a97