Merge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f
am: 57ba0ddc91

Change-Id: Idac309f0674a33ef9dd3a6769c217568828f8f8d