am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."

* commit 'cc7aebb8d30f01029f43be730c27c794b8f39aa6':
  Restore generic_x86 sepolicy zygote.te file.