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

Change-Id: Ia180c4ee450047a108581e90b085ebb2b1941f55