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

Change-Id: Iadf2fa37a64074f306b5b6ddb4d8c81644c3383d