Finish fixing Zygote descriptor leakage problem

Change-Id: Ic985bee9f9ec58d7c2c6ae6506a669c3d33c8243