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

Change-Id: Ib3e0aa31463296d33ebd565f533d2c9a6d42b948