Merge "Move seccomp policy logic to bionic" am: 7ed4ca9032
am: d97791e74f

Change-Id: I12c1efaa13d3998fc9fb22ec08df4a12bf29c3c8