Finish fixing Zygote descriptor leakage problem

Conflicts:
	core/java/com/android/internal/os/ZygoteConnection.java