Merge "Revert "Fix bogus interaction between code cache and instrumentation.""
am: a8fde8e67d

* commit 'a8fde8e67dc8d15a436db16c7bbe201dbb249290':
  Revert "Fix bogus interaction between code cache and instrumentation."