Merge "Add a default value for ro.zygote."