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

* commit '15d4751caaed9dbf57e98f78a4775b14f379f426':
  Fix art_quick_instrumentation_entry stub for x86/x86_64