Merge "Expand seccomp whitelist" am: 301e7e2cdb
am: 329417241e

Change-Id: I19023b91ef48560d20b2678e2b4789f983cc409c