Merge "Revert "Remove many `instrumentation` variables from goto interpreter.""
am: c2c9bcb

* commit 'c2c9bcb716cdfed2337a7715dd33667b3bb71fba':
  Revert "Remove many `instrumentation` variables from goto interpreter."

Change-Id: Ia9d1f17ea824623d6949b6903f63d537dd134381