am 9b025dbb: am 6990bdab: Merge "Fix DCHECK in artInstrumentationMethodEntryFromCode"

* commit '9b025dbb6e3d94ed827470340811c1826966ba93':
  Fix DCHECK in artInstrumentationMethodEntryFromCode