ClassLinker changes

- Add ClassLinker::LockOwner for SignalCatcher
- ClassLinker::ResolveMethod now sets CodeAndDirectMethod when code is available

Change-Id: I404b80d1994808e018d00e0b30e8ba4f9d08fecc
diff --git a/src/monitor.h b/src/monitor.h
index 459cb04..829f0fb 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -65,7 +65,7 @@
   static bool IsVerbose();
   static void SetVerbose(bool is_verbose);
 
-  static uint32_t GetLockOwner(uint32_t raw_lock_word);
+  static uint32_t GetThinLockId(uint32_t raw_lock_word);
 
   static void MonitorEnter(Thread* thread, Object* obj);
   static bool MonitorExit(Thread* thread, Object* obj);