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

Change-Id: I1bd484bad3b6c51f60a12e6d8568b8928ef643e0