ObjPtr<>-ify method/var handles, fix stale refs in tests.
Test: m test-art-host-gtest
Test: testrunner.py --host --interpreter
Bug: 31113334
Change-Id: I89ea84f7970899643e437161b598d3232a182e98
diff --git a/runtime/method_handles.cc b/runtime/method_handles.cc
index aeeb05b..dac68fa 100644
--- a/runtime/method_handles.cc
+++ b/runtime/method_handles.cc
@@ -25,7 +25,7 @@
#include "mirror/class-inl.h"
#include "mirror/emulated_stack_frame-inl.h"
#include "mirror/method_handle_impl-inl.h"
-#include "mirror/method_type.h"
+#include "mirror/method_type-inl.h"
#include "mirror/var_handle.h"
#include "reflection-inl.h"
#include "reflection.h"