Merge "Combine platform and vendor seccomp policy at runtime"