Merge "Revert "Enable seccomp in init with generated policy"" am: d85cf0fb7d
am: fa5524fa6e

Change-Id: I4d1f5894a6868fd690b7a559aea63ba877fa7e0e