Merge "Merge "Fix interaction between instrumentation and jit lock." into nyc-dev am: 0a27a8b4 am: 6576aa05" into nyc-mr1-dev-plus-aosp