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

Change-Id: Ifcf1c09624d622abce2f9c69966da25ce8bcec09