am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"

* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem