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

Change-Id: Ife5174a5b06a2ae08c1265ff36de2b289ba632bd