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

* commit '9590a5388ae80c7edba96de777eb5f96a896e681':
  Remove many `instrumentation` variables from goto interpreter.

Change-Id: I8f119dbab35a9391a2de261e922cd4f7c52376c4