compel: criu -- Use sole syscalls object instead of std plugin

@std plugin known to fail when trying to execute,
investigating now. Meanwhile to not block tests
lets use syscalls object file.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/pie/Makefile

@@ -13,7 +13,7 @@ restorer-obj-y		+= restorer.o
 restorer-obj-y		+= ./$(ARCH_DIR)/restorer.o
 
 ifeq ($(ARCH),x86)
-        restorer-obj-e		+= ./compel/plugins/std.built-in.o
+        restorer-obj-e		+= ./compel/arch/$(ARCH)/plugins/std/syscalls-64.o
 
         ifeq ($(CONFIG_COMPAT),y)
                 restorer-obj-y	+= ./$(ARCH_DIR)/call32.o
@@ -21,7 +21,7 @@ ifeq ($(ARCH),x86)
         endif
 
         native-obj-y		+= ./$(ARCH_DIR)/parasite-head-64.o
-        native-obj-e		+= ./compel/plugins/std.built-in.o
+        native-obj-e		+= ./compel/arch/$(ARCH)/plugins/std/syscalls-64.o
         compat-obj-y		+= ./$(ARCH_DIR)/parasite-head-32.o
         compat-obj-e		+= ./compel/plugins/std-32.built-in.o
 
@@ -32,8 +32,8 @@ ifeq ($(ARCH),x86)
         AFLAGS_parasite-head-32.d += -fno-pic -m32 -DCONFIG_X86_32
 else
         native-obj-y		+= ./$(ARCH_DIR)/parasite-head.o
-        native-obj-e		+= ./compel/plugins/std.built-in.o
-        restorer-obj-e		+= ./compel/plugins/std.built-in.o
+        native-obj-e		+= ./compel/arch/$(ARCH)/plugins/std/syscalls/syscalls.o
+        restorer-obj-e		+= ./compel/arch/$(ARCH)/plugins/std/syscalls/syscalls.o
 endif
 
 target			+= $(parasite_target) restorer