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

This reverts commit 0130272b5ac519531a82aa435ac8230a317977ba.