Merge "Expand seccomp whitelist" am: 0f0caf95c9 am: c84d14088e am: 18853fdc22
am: 61bd8e4fb5

Change-Id: I56d2ee2df31f0edc1dbe10cfe8d4e524aacc92d2