am 5137fa03: am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"

* commit '5137fa03c3e416c6f68c36f3ec922621853609b1':
  Finish fixing Zygote descriptor leakage problem