Merge "Update getpwnam() tests to correctly handle new app zygote uids."
am: de70b72b4f

Change-Id: I46b94dc07a4d5f37849c370cc4962b4c2a8cfcb0