Merge "Use getpwnam() instead of AID_* macros"