am 35d09b69: Merge "logd: pidToUid incorrect"

* commit '35d09b6928d77d619d95d87f6fe16eaedc99a954':
  logd: pidToUid incorrect