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

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