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

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