am 9c328e67: am 35d09b69: Merge "logd: pidToUid incorrect"

* commit '9c328e67c0eb64f7d73dd5b537950c02b62bd77c':
  logd: pidToUid incorrect