Merge "Remove the global seccomp option."
am: f3a5ab8b1d

Change-Id: Ib986b3df12b6e3a36daa2ea8f6bb870ecf367b0f