Merge "Code cleanup between debugger and jit."
am: 1153282

* commit '1153282aa91292b740289ab7612a481e5c6bc167':
  Code cleanup between debugger and jit.