Merge "Remove many `instrumentation` variables from goto interpreter." am: 9590a53
am: 82be946

* commit '82be9464f9f160df4bd9086a0f69f254455dcf88':
  Remove many `instrumentation` variables from goto interpreter.

Change-Id: I2beeb39a9a813b7af208ff38076dd3985737edae