Merge "logd: always report the UID of a log message" am: 405e67b651
am: 987e61a15e

Change-Id: I7774822fe77ce19f4f2c7971af906fd77d56c0a2