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

Change-Id: I786d45166f841c47f34108d11a82ad5faa99820c