Merge "Fix interaction between instrumentation and jit lock."