Merge "logd: always report the UID of a log message"