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

This reverts commit 271216dfae018fbf73f1bef97010a6ad10e86475.