Merge "logd: handle uidToName() directly" am: caa95d551d
am: 1e48f513b2

Change-Id: I3dfaef4e3a2617370add498d468b7ca5af825f57