Merge "Expand seccomp whitelist" am: fd77a331eb
am: 1201ce98dd

Change-Id: I87fa2d6962ebb288c8c79488cfaf73485fca7bbf