Merge "Fix interaction between instrumentation and jit lock." into nyc-dev
am: 0a27a8b43f

* commit '0a27a8b43f083627da2bd2a27a16e00b0b504b8b':
  Fix interaction between instrumentation and jit lock.

Change-Id: Icd0bcbac6778f4d931f39a857bea1d31a0985acf