Merge "Fix android.os.cts.SeccompTest for Nougat on i386 and x86_64." into marshmallow-cts-dev
am: 27cd0e6f97

Change-Id: Ie9b0330d7e55543f735d74766098c860588d205d