Merge "Fix deadlock with the JIT code cache." am: df6dc42ba2
am: f7542d8c8a

* commit 'f7542d8c8ab53c4324493f576d8e82164a1c16be':
  Fix deadlock with the JIT code cache.