Merge "Revert "Test for jit deadlock""
am: 5d7015cd64

Change-Id: Ib837ec7b4ee5b2fc65dbf93e28d14f7fe3e34436