Merge "logd: uidToName improvement"