Remove ExtractCodeAndPrelink and switch Portable to MCLinker

Change-Id: Ia2459c7da6b79e0a1c0f1148c6e28ad9cbbe27a2
diff --git a/src/image_test.cc b/src/image_test.cc
index 6d22cad..dc16a6c 100644
--- a/src/image_test.cc
+++ b/src/image_test.cc
@@ -57,9 +57,13 @@
         mirror::Class* klass = class_linker_->FindSystemClass(descriptor);
         EXPECT_TRUE(klass != NULL) << descriptor;
       }
+      bool success_elf = compiler_driver_->WriteElf(NULL,
+                                                    !kIsTargetBuild,
+                                                    dex_files,
+                                                    oat_contents,
+                                                    tmp_elf.GetFile());
+      ASSERT_TRUE(success_elf);
     }
-    bool success_elf = compiler_driver_->WriteElf(oat_contents, tmp_elf.GetFile());
-    ASSERT_TRUE(success_elf);
   }
   // Workound bug that mcld::Linker::emit closes tmp_elf by reopening as tmp_oat.
   UniquePtr<File> tmp_oat(OS::OpenFile(tmp_elf.GetFilename().c_str(), true, false));