Merge "Expand seccomp whitelist"
am: 2cd07e8b97

Change-Id: Ifb12885c6fa7d0f16306984d10a8da4b4b9d1a20