Merge "Expand seccomp whitelist"
am: c6c11723cb

Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52