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

Change-Id: Ib4396cec9ffe2a196a1fce8c99e046606ecabca2