Merge "Expand seccomp whitelist" am: 10e7aed13f am: 0ab0d47516 am: 53e6c94c0b
am: ce8f7cb388

Change-Id: Ia626354e255a0e8bc66529174460e53ddf72f067