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

Change-Id: Ic8b444376fcd8ed54215069424f6ce852b296b43