Merge "Revert "Move seccomp policy logic to bionic""