Finish fixing Zygote descriptor leakage problem

Change-Id: Ie151c7704b3bbdb2c333887696d1bb89444f5b01