Merge "Optimize seccomp"
am: 7e812616c9

Change-Id: I6061c25fe18b136d9a4920acd3f54043c44abe4a