Merge "Expand seccomp whitelist" am: c6c11723cb
am: 3b9c0fadda

Change-Id: I50851e4d3c92d53562e593be0b82c09709262d4a