Merge "logd: pidToUid incorrect"