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

* commit 'd65b1281f43660b9405d050ccfddb946fc6e10a2':
  logd: pidToUid incorrect