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

Change-Id: Ice9ce765693d754b53347c2601f97551b689032e