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

Change-Id: Ib5cddc2aeaea739ebb12246db86c96d7ae016dc3