Merge "Revert "Move zygote's seccomp setup to post-fork"" am: 54da93b981 am: 8fffe22ab1
am: 5e1a526cf4  -s ours

Change-Id: I11e888498254518ae3d269bdd0582b3d16fb8959