Merge "Fix null ptr dereference if jit debug not enabled." am: b04bbccbb6
am: 67c7c1d911

Change-Id: I70f68f022f2dbf59078dfcb424fdd7c7f29ce402