Merge "Fix DCHECK in artInstrumentationMethodEntryFromCode"