Revert of [wasm] Master CL for Binary 0xC changes.

test/mjsunit/wasm/import-table.js

Index: test/mjsunit/wasm/import-table.js
diff --git a/test/mjsunit/wasm/import-table.js b/test/mjsunit/wasm/import-table.js
index aa836d6eacd5949c77ea6d4efafcc6c9fff4fe7a..8680addf615566166bc15a4afc470957b99fa9e4 100644
--- a/test/mjsunit/wasm/import-table.js
+++ b/test/mjsunit/wasm/import-table.js
@@ -16,7 +16,7 @@
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0])         // --
+      kExprCallImport, 2, 0])      // --
     .exportAs("main");
 
   var main = builder.instantiate({func: func}).exports.main;
@@ -191,7 +191,7 @@
     .addBody([
       kExprGetLocal, 0,           // --
       kExprGetLocal, 1,           // --
-      kExprCallFunction, 0,       // --
+      kExprCallImport, 2, 0,      // --
       kExprI8Const, 99,           // --
     ])
     .exportFunc("main");
@@ -246,9 +246,9 @@
   builder.addFunction("main", makeSig_r_x(kAstF64, kAstF64))
     .addBody([
       kExprI8Const, 97,             // --
-      kExprCallFunction, 0,  // --
+      kExprCallImport, kArity1, 0,  // --
       kExprGetLocal, 0,             // --
-      kExprCallFunction, 1   // --
+      kExprCallImport, kArity1, 1   // --
     ])
     .exportFunc();
 
@@ -270,8 +270,8 @@
   builder.addImport("bar", kSig_i);
   builder.addFunction("main", kSig_i)
     .addBody([
-      kExprCallFunction, 0, // --
-      kExprCallFunction, 1, // --
+      kExprCallImport, kArity0, 0, // --
+      kExprCallImport, kArity0, 1, // --
       kExprI32Add,                 // --
     ])                             // --
     .exportFunc();