Merge "Fix art_quick_instrumentation_entry stub for x86/x86_64"