Merge "logd: switch from android_ids to getpwuid" am: 9a3e238
am: 3c1cd70

* commit '3c1cd7022cc3081e7e11343500afd7648cbd3275':
  logd: switch from android_ids to getpwuid

Change-Id: I442ec46a3491858241d94d6f2a67de49f0808019