Merge "Fix very rare bug around JIT code cache collection." am: 03f9e6bbda
am: 2c747f0f4b

* commit '2c747f0f4b2ecbf121c1b19bf0b713c1bbbddad5':
  Fix very rare bug around JIT code cache collection.