Merge "Use killProcessGroup when killing app zygote." into rvc-dev am: 0a8ef2b45f am: f1e067d713 am: f869b24229

Original change: undetermined

Change-Id: I9b358fd9f6050c3e4ec74048d4c783d7b9bf1c9e

core/java/android/os/AppZygote.java

@@ -92,10 +92,9 @@ public class AppZygote {
     @GuardedBy("mLock")
     private void stopZygoteLocked() {
         if (mZygote != null) {
-            // Close the connection and kill the zygote process. This will not cause
-            // child processes to be killed by itself.
             mZygote.close();
-            Process.killProcess(mZygote.getPid());
+            // use killProcessGroup() here, so we kill all untracked children as well.
+            Process.killProcessGroup(mZygoteUid, mZygote.getPid());
             mZygote = null;
         }
     }