Merge "Expand seccomp whitelist" am: 10e7aed13f
am: 0ab0d47516

Change-Id: Id7512df1f0df56f73352c82a3ad55eb5360ebd91