Merge "Fix android.os.cts.SeccompTest for Nougat on i386 and x86_64." into marshmallow-cts-dev am: 27cd0e6f97 am: 52eb265787 am: f8bc0bb0b3 am: bdb23dbee9 am: e646a0d73f am: 00d72f22b3
am: 00f5fe63b9

Change-Id: I458d9dd33acb883bb3b0395cce2590bdae93e5fa