Merge "port 0a682b1855fb8c63a8fb502d60b37259dc893302 to art" into dalvik-dev
diff --git a/src/native/dalvik_system_Zygote.cc b/src/native/dalvik_system_Zygote.cc
index 1c4c986..dcfe9d2 100644
--- a/src/native/dalvik_system_Zygote.cc
+++ b/src/native/dalvik_system_Zygote.cc
@@ -403,14 +403,14 @@
 
     SetRLimits(env, javaRlimits);
 
-    int rc = setgid(gid);
+    int rc = setresgid(gid, gid, gid);
     if (rc == -1) {
-      PLOG(FATAL) << "setgid(" << gid << ") failed";
+      PLOG(FATAL) << "setresgid(" << gid << ") failed";
     }
 
-    rc = setuid(uid);
+    rc = setresuid(uid, uid, uid);
     if (rc == -1) {
-      PLOG(FATAL) << "setuid(" << uid << ") failed";
+      PLOG(FATAL) << "setresuid(" << uid << ") failed";
     }
 
 #if defined(__linux__)