am 6990bdab: Merge "Fix DCHECK in artInstrumentationMethodEntryFromCode"

* commit '6990bdab0322da35bb6f38c79b21c241a4347f89':
  Fix DCHECK in artInstrumentationMethodEntryFromCode