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

test/mjsunit/wasm/compiled-module-serialization.js

Index: test/mjsunit/wasm/compiled-module-serialization.js
diff --git a/test/mjsunit/wasm/compiled-module-serialization.js b/test/mjsunit/wasm/compiled-module-serialization.js
index aa36b7188209fe07f7697c59c96836f327f52880..00b9d19597074264d0dfd3eb575864019b32333d 100644
--- a/test/mjsunit/wasm/compiled-module-serialization.js
+++ b/test/mjsunit/wasm/compiled-module-serialization.js
@@ -17,13 +17,13 @@
 
   builder.addFunction("main", kSig_i_i)
     .addBody([
+      kExprI32Const, 1,
       kExprGetLocal, 0,
       kExprI32LoadMem, 0, 0,
-      kExprI32Const, 1,
-      kExprCallIndirect, signature,
+      kExprCallIndirect, kArity1, signature,
       kExprGetLocal,0,
       kExprI32LoadMem,0, 0,
-      kExprCallFunction, 0,
+      kExprCallImport, kArity0, 0,
       kExprI32Add
     ]).exportFunc();
 
@@ -32,8 +32,8 @@
   builder.addFunction("_wrap_writer", signature)
     .addBody([
       kExprGetLocal, 0,
-      kExprCallFunction, 1]);
-  builder.appendToTable([2, 3]);
+      kExprCallImport, kArity1, 1]);
+  builder.appendToTable([0, 1]);
 
 
   var module = new WebAssembly.Module(builder.toBuffer());