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

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