am cf4a20cf: Interpreter/Debugger fix #4479968

* commit 'cf4a20cf0cbc53f03a5b16c7152bbb29907f7108':
  Interpreter/Debugger fix #4479968

diff --cc vm/compiler/codegen/arm/CodegenDriver.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-allstubs.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-armv5te-vfp.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-armv5te.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-armv7-a-neon.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-armv7-a.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-portable.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-x86-atom.cpp
Simple merge

diff --cc vm/mterp/out/InterpC-x86.cpp
Simple merge

diff --cc vm/mterp/portable/entry.cpp
Simple merge