Merge "Fix interaction between instrumentation and jit lock." into nyc-dev am: 0a27a8b4 am: 6387cb8a am: 2d58fc0e * commit '2d58fc0e': Fix interaction between instrumentation and jit lock. Change-Id: Ic517606e6810b201b3ebfcca5cfac877f293d9c0