Merge "Test for jit deadlock"
am: 0e2cf3f17c

Change-Id: I0813a60bbe4e3cfb4da3cbdf9c99a6b5d3aab70f