Merge "Expand seccomp whitelist" am: 301e7e2cdb am: 329417241e am: 32ad0ad150
am: 8840e75f71

Change-Id: I7e50d157c7d2e5d5f030b6e94bb794a94bd05ead