Merge "Fix android.os.ProcessTest."