am 410709fa: Merge "Fix art_quick_instrumentation_entry stub for x86/x86_64"

* commit '410709facb361c5503c7825f01edd264f4450666':
  Fix art_quick_instrumentation_entry stub for x86/x86_64