Merge "logd: handle uidToName() directly"