Merge "Move seccomp policy logic to bionic" am: ef64558393
am: da6d5f702d

Change-Id: I474f127d2924190e1154cc9d3f1afdfa064154ae