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

Change-Id: Ic697378e3ab2293d153800facfe43935180664bc