Merge "liblog: remove android_ids and replace with getpwuid"