Don't disable inlining for ARM.

I think there was confusion here between method inlining and the method
compiler. Just because the latter isn't yet functional doesn't mean we
don't want the former for those targets that support it.

(cherry-pick of 4b3f78e73109604b817294a9c21bc3653328e3fb.)

Bug: 7179010
Change-Id: I627badb448a056ed4a1cc1e75a05325ce6112876
diff --git a/vm/Init.cpp b/vm/Init.cpp
index 1ae458d..11d884e 100644
--- a/vm/Init.cpp
+++ b/vm/Init.cpp
@@ -1280,7 +1280,6 @@
 
     gDvm.constInit = false;
     gDvm.commonInit = false;
-    gDvmJit.disableOpt = 1<<kMethodInlining;
 #else
     gDvm.executionMode = kExecutionModeInterpFast;
 #endif
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
index 222b880..84744b5 100644
--- a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#if 0
+
 /*
  * Rebuild the interpreter frame then punt to the interpreter to execute
  * instruction at specified PC.
@@ -445,3 +447,11 @@
     selfVerificationBranchInsertPass(cUnit);
 #endif
 }
+
+#else
+
+void dvmCompilerMethodMIR2LIR(CompilationUnit *cUnit) {
+    // Method-based JIT not supported for ARM.
+}
+
+#endif
diff --git a/vm/compiler/codegen/x86/CodegenInterface.cpp b/vm/compiler/codegen/x86/CodegenInterface.cpp
index aade180..c99fadd 100644
--- a/vm/compiler/codegen/x86/CodegenInterface.cpp
+++ b/vm/compiler/codegen/x86/CodegenInterface.cpp
@@ -189,8 +189,7 @@
 
 void dvmCompilerMethodMIR2LIR(CompilationUnit *cUnit)
 {
-    ALOGE("Method-based JIT not supported for the x86 target");
-    dvmAbort();
+    // Method-based JIT not supported for x86.
 }
 
 void dvmJitScanAllClassPointers(void (*callback)(void *))