Merge "Expand seccomp whitelist" am: 10e7aed13f am: 0ab0d47516
am: 53e6c94c0b

Change-Id: I4f6e9e4c705505861c7b61dcc2c36f3d997a402d