Merge "Change seccomp to the system filter" am: 1406d991a3 am: 003b330540
am: 4e3bac206f

Change-Id: Ic833afcebfcc4db44c48153d9ab7fc7d7017aaa9