Merge "Expand seccomp whitelist" am: 2cd07e8b97 am: c6030b290d
am: 2d9d99f398

Change-Id: I8ccf9736d353d49a0018212c25a47b1820cd69f7