Simplify command line arguments

Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7
diff --git a/oat_process/app_main.cpp b/oat_process/app_main.cpp
index 9ccdf16..c5ec8e9 100644
--- a/oat_process/app_main.cpp
+++ b/oat_process/app_main.cpp
@@ -212,9 +212,9 @@
     // TODO: remove Calculator special case
     int oatArgc = argc + 2;
     const char* oatArgv[oatArgc];
-    if (strcmp(argv[0], "-Xbootimage:/system/framework/boot.oat") != 0) {
+    if (strcmp(argv[0], "-Ximage:/system/framework/boot.oat") != 0) {
         LOG(INFO) << "Adding oat arguments";
-        oatArgv[0] = "-Xbootimage:/system/framework/boot.oat";
+        oatArgv[0] = "-Ximage:/system/framework/boot.oat";
         oatArgv[1] = "-Ximage:/system/app/Calculator.oat";
         setenv("CLASSPATH", "/system/app/Calculator.apk", 1);
         memcpy(oatArgv + (oatArgc - argc), argv, argc * sizeof(*argv));