Remove mterp.

Test: test.py
Change-Id: Id800bcf86965ab19cf1e79ecbfa8996a6a6c335e
diff --git a/tools/cpp-define-generator/globals.def b/tools/cpp-define-generator/globals.def
index 50f9b33..ae8f5aa 100644
--- a/tools/cpp-define-generator/globals.def
+++ b/tools/cpp-define-generator/globals.def
@@ -22,7 +22,6 @@
 #include "dex/modifiers.h"
 #include "gc/accounting/card_table.h"
 #include "gc/heap.h"
-#include "interpreter/mterp/mterp.h"
 #include "interpreter/mterp/nterp.h"
 #include "jit/jit.h"
 #include "mirror/object.h"
@@ -61,10 +60,10 @@
            art::jit::kJitHotnessDisabled)
 ASM_DEFINE(MIN_LARGE_OBJECT_THRESHOLD,
            art::gc::Heap::kMinLargeObjectThreshold)
-ASM_DEFINE(MTERP_HANDLER_SIZE,
-           art::interpreter::kMterpHandlerSize)
-ASM_DEFINE(MTERP_HANDLER_SIZE_LOG2,
-           art::WhichPowerOf2(art::interpreter::kMterpHandlerSize))
+ASM_DEFINE(NTERP_HANDLER_SIZE,
+           art::interpreter::kNterpHandlerSize)
+ASM_DEFINE(NTERP_HANDLER_SIZE_LOG2,
+           art::WhichPowerOf2(art::interpreter::kNterpHandlerSize))
 ASM_DEFINE(OBJECT_ALIGNMENT_MASK,
            art::kObjectAlignment - 1)
 ASM_DEFINE(OBJECT_ALIGNMENT_MASK_TOGGLED,