Merge "Expand seccomp whitelist" am: 0f0caf95c9
am: c84d14088e

Change-Id: I1812c3703c7bb547cca16042540f4728fbc9dfc1