Revert "Finish fixing Zygote descriptor leakage problem"

This reverts commit d5df12e11fbfe49f7f98baf66abf3ec994f98d01.

Change-Id: Iebca12e6e8126d978068b8b059d77425c4973143