Revert "Finish fixing Zygote descriptor leakage problem"

This reverts commit 55a650c71669c524d273c48da1370a6967fec115.

Change-Id: I82187c2ecfd800ef293a41135c44c153e869a755
Merge "Revert "Finish fixing Zygote descriptor leakage problem"" into kitkat-caf