Revert "Revert "Finish fixing Zygote descriptor leakage problem""

This reverts commit 187d31cb07d5a96455529f701e9a8e221bac6f4f.