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

Change-Id: I763af68f840af7f5b2902a4906bbf7e2166ce132