Move back to jit code on trace removal

This changes the lock hierarchy so the lock checker is able to
correctly determine that we will not deadlock. This lets us replace
the jit code in the method when tracing is removed.

Test: ./test.py --host

Change-Id: I14dd4eb9814c73fa3639239bb56d91c8303cec60
5 files changed