Merge "Expand seccomp whitelist" am: 2cd07e8b97
am: c6030b290d

Change-Id: Id391b26003abade0ecc6aab2db4b452bbbc88eba