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

Change-Id: If9652ab58b37d2011251345bf5e85afdb3bac4d6