Merge "Update getpwnam() tests to correctly handle new app zygote uids." am: de70b72b am: 83ec4fdd am: f2f89976 Change-Id: I45fe9607f9a20a23779925d49fc207a2d733fe05