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

Change-Id: I9ecf11de7bef9f199700b3539b526ce3a9e7dea5