sccomp: Make the source files more similar and fix some problems.

Change-Id: I1e3c8aac52e9d2677937e08aac08db4ace5cb2b8