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

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

Change-Id: I5d85cbf55914c0cc4568382548d63671f3fa84d2