Merge "Expand seccomp whitelist"
am: 0f0caf95c9

Change-Id: I97aac1b65cb41b5466411cef5e25d8a71d1c62e3