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

* commit '34ddfa034f6e22f9c8d5121c39aaa6019efd8ec4':
  Remove many `instrumentation` variables from goto interpreter.

Change-Id: I7281e53f71b6c9bef2dbe238921c9f56699febd8