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

Change-Id: I311f326743a9945eec04aebafaadbf6b64e06fe3