Merge "Expand seccomp whitelist"
am: fd77a331eb

Change-Id: I824c984b907e43248d6eba6259f31f4aab7d64db