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

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

Change-Id: I7b6ce457888870982306f2659732bee3fe6f2c9e