Merge "Change seccomp to the system filter" am: 1406d991a3
am: 003b330540

Change-Id: Ia60015aedcf318456a2de1843d2584dffa5deccb