Merge "Expand seccomp whitelist"
am: 301e7e2cdb

Change-Id: I95275cc837f87c7025b74ddc56ba3477d2789798