Merge "logd: switch from android_ids to getpwuid"