Merge "Use getpwnam() instead of AID_* macros"
am: a124b81ac8

Change-Id: I14c697f537a83a8d99bed697a2fbba105c9cb2a3