am ff1f639c: am 80b129f9: Merge "logd: uidToName add dex2oat UID"

* commit 'ff1f639c801983a364c7c89355de0b83a3f43485':
  logd: uidToName add dex2oat UID