Merge "Revert "Move seccomp policy logic to bionic""
am: 4ebce43b37

Change-Id: I276412507fcb3ef577931e7406964fd7040615c7