Merge "Fix bogus interaction between code cache and instrumentation."