Merge "Restore generic_x86 sepolicy zygote.te file."