Merge "Optimize seccomp" am: 7e812616c9
am: 9375f3eff6

Change-Id: I8cc56a3e5512764a02004f27f976e72da554ef38