am 289476b6: am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"

* commit '289476b65b8129729936f75a3549eb99257df482':
  clean up native com.android.internal.os.Zygote