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

Change-Id: I66240087a249d41138c13942c872f1bacb5fb81c