Merge "Expand seccomp whitelist" am: c6c11723cb am: 3b9c0fadda
am: 507c3fb099

Change-Id: Idcdec4c87b2ad5f91cbe05874ea532139fe38d42