Merge "Use getpwnam() instead of AID_* macros" am: a124b81ac8 am: f7bcce468f am: f16e492e94
am: 43aeb8442d  -s ours

Change-Id: Ibfbec2ca30ea4c2e4a2b4eea33295e80ac011429