Merge "Finish fixing Zygote descriptor leakage problem"